package/uboot-tools: fix build with FIT
Build with FIT is broken since bump to version 2021.04 in commit
a4c38ae470
Fake a generated/autoconf.h with just the needed stuff as suggested by
Yann E. Morin in
https://patchwork.ozlabs.org/project/buildroot/patch/20210422210559.707845-1-fontaine.fabrice@gmail.com
It seems that an empty file is enough as make options are still
interpreted
As a side-effect, drop third patch
Fixes:
- http://autobuild.buildroot.org/results/5771a7413c98ec202c9623672787a1eee74da5e0
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
This commit is contained in:
committed by
Yann E. MORIN
parent
3ab8aefa87
commit
a8eef7d2e6
@@ -1,36 +0,0 @@
|
|||||||
From 0552a8ffdfbb9807fcef4498011907caa5de2ace Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?J=C3=B6rg=20Krause?= <joerg.krause@embedded.rocks>
|
|
||||||
Date: Thu, 9 Jan 2020 15:11:32 +0100
|
|
||||||
Subject: [PATCH] drop autoconf.h from tools
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: text/plain; charset=UTF-8
|
|
||||||
Content-Transfer-Encoding: 8bit
|
|
||||||
|
|
||||||
We need to build u-boot tools without a board configuration for the target.
|
|
||||||
|
|
||||||
imximage uses the DCD address from Kconfig to display this information
|
|
||||||
to the user. The default value for all i.MX platforms is 0x00910000,
|
|
||||||
except for i.MX7ULP, which has a DCD address of 0x2f010000.
|
|
||||||
|
|
||||||
The default value printed before version 2020.01 was 0x00910000.
|
|
||||||
|
|
||||||
Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
|
|
||||||
---
|
|
||||||
tools/imximage.c | 1 -
|
|
||||||
1 file changed, 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/tools/imximage.c b/tools/imximage.c
|
|
||||||
index d7edd3c52f..f8d21fa06a 100644
|
|
||||||
--- a/tools/imximage.c
|
|
||||||
+++ b/tools/imximage.c
|
|
||||||
@@ -11,7 +11,6 @@
|
|
||||||
#include "imagetool.h"
|
|
||||||
#include <image.h>
|
|
||||||
#include "imximage.h"
|
|
||||||
-#include <generated/autoconf.h>
|
|
||||||
|
|
||||||
#define UNDEFINED 0xFFFFFFFF
|
|
||||||
|
|
||||||
--
|
|
||||||
2.25.0
|
|
||||||
|
|
||||||
@@ -20,6 +20,8 @@ HOST_UBOOT_TOOLS_DEPENDENCIES = $(BR2_MAKE_HOST_DEPENDENCY)
|
|||||||
define UBOOT_TOOLS_CONFIGURE_CMDS
|
define UBOOT_TOOLS_CONFIGURE_CMDS
|
||||||
mkdir -p $(@D)/include/config
|
mkdir -p $(@D)/include/config
|
||||||
touch $(@D)/include/config/auto.conf
|
touch $(@D)/include/config/auto.conf
|
||||||
|
mkdir -p $(@D)/include/generated
|
||||||
|
touch $(@D)/include/generated/autoconf.h
|
||||||
endef
|
endef
|
||||||
|
|
||||||
UBOOT_TOOLS_MAKE_OPTS = CROSS_COMPILE="$(TARGET_CROSS)" \
|
UBOOT_TOOLS_MAKE_OPTS = CROSS_COMPILE="$(TARGET_CROSS)" \
|
||||||
@@ -94,6 +96,8 @@ endef
|
|||||||
define HOST_UBOOT_TOOLS_CONFIGURE_CMDS
|
define HOST_UBOOT_TOOLS_CONFIGURE_CMDS
|
||||||
mkdir -p $(@D)/include/config
|
mkdir -p $(@D)/include/config
|
||||||
touch $(@D)/include/config/auto.conf
|
touch $(@D)/include/config/auto.conf
|
||||||
|
mkdir -p $(@D)/include/generated
|
||||||
|
touch $(@D)/include/generated/autoconf.h
|
||||||
endef
|
endef
|
||||||
|
|
||||||
HOST_UBOOT_TOOLS_MAKE_OPTS = HOSTCC="$(HOSTCC)" \
|
HOST_UBOOT_TOOLS_MAKE_OPTS = HOSTCC="$(HOSTCC)" \
|
||||||
|
|||||||
Reference in New Issue
Block a user