From 2ebf652589491ac2f8f3825afa5f75156c88b0a0 Mon Sep 17 00:00:00 2001 From: Atsushi Nemoto Date: Mon, 15 Aug 2022 10:02:52 +0900 Subject: [PATCH] package/uboot-tools: fix dumpimage for FIT image The upstream commit 7a01882eb37e7504e2450f474d0cc8db60ed26c2 ("common: Kconfig.boot: Add FIT_PRINT config option") introduce CONFIG_FIT_PRINT and make fit_print_contents() empty if it was not enabled. Adding CONFIG_FIT_PRINT=y to UBOOT_TOOLS_MAKE_OPTS does not help while CONFIG_FIT_PRINT=y affects Makefiles only, not C sources. Add "#define CONFIG_FIT_PRINT 1" to autoconf.h if FIT_SUPPORT enabled. It would be better to convert uboot-tools to kconfig infrastructure so we can use KCONFIG_ENABLE_OPT etc. However, that's a much bigger change and not suitable for backporting to stable branches. Therefore, for now, take the simple approach of updating autoconf.h. Signed-off-by: Atsushi Nemoto Signed-off-by: Arnout Vandecappelle --- package/uboot-tools/uboot-tools.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/uboot-tools/uboot-tools.mk b/package/uboot-tools/uboot-tools.mk index 7cd527ad12..d884a010fb 100644 --- a/package/uboot-tools/uboot-tools.mk +++ b/package/uboot-tools/uboot-tools.mk @@ -22,6 +22,7 @@ define UBOOT_TOOLS_CONFIGURE_CMDS touch $(@D)/include/config/auto.conf mkdir -p $(@D)/include/generated touch $(@D)/include/generated/autoconf.h + echo $(if $(BR2_PACKAGE_UBOOT_TOOLS_FIT_SUPPORT),'#define CONFIG_FIT_PRINT 1') >> $(@D)/include/generated/autoconf.h mkdir -p $(@D)/include/asm touch $(@D)/include/asm/linkage.h endef @@ -111,6 +112,7 @@ define HOST_UBOOT_TOOLS_CONFIGURE_CMDS touch $(@D)/include/config/auto.conf mkdir -p $(@D)/include/generated touch $(@D)/include/generated/autoconf.h + echo $(if $(BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT),'#define CONFIG_FIT_PRINT 1') >> $(@D)/include/generated/autoconf.h mkdir -p $(@D)/include/asm touch $(@D)/include/asm/linkage.h endef