summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2021-09-25 19:43:22 -0600
committerTom Rini <trini@konsulko.com>2021-10-08 15:53:26 -0400
commite059157f0d5737b63fe2f1fec145509d82508109 (patch)
treeb6aac1103e34b2600dbdaa88c88e8c8f8c01d235
parent0c303f9a6628de9664b4f9140464a6f9d8224c36 (diff)
downloadu-boot-e059157f0d5737b63fe2f1fec145509d82508109.tar.gz
u-boot-e059157f0d5737b63fe2f1fec145509d82508109.tar.bz2
u-boot-e059157f0d5737b63fe2f1fec145509d82508109.zip
image: Use Kconfig to enable CONFIG_FIT_VERBOSE on host
Add a host Kconfig for FIT_VERBOSE. With this we can use CONFIG_IS_ENABLED(FIT_VERBOSE) directly in the tools build, so drop the forcing of this in the image.h header. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
-rw-r--r--include/image.h5
-rw-r--r--tools/Kconfig5
2 files changed, 7 insertions, 3 deletions
diff --git a/include/image.h b/include/image.h
index f09eb9de51..6efbef06e6 100644
--- a/include/image.h
+++ b/include/image.h
@@ -28,7 +28,6 @@ struct fdt_region;
#include <linux/kconfig.h>
/* new uImage format support enabled on host */
-#define CONFIG_FIT_VERBOSE 1 /* enable fit_format_{error,warning}() */
#define CONFIG_FIT_RSASSA_PSS 1
#define IMAGE_ENABLE_IGNORE 0
@@ -1458,7 +1457,7 @@ int fit_image_cipher_get_algo(const void *fit, int noffset, char **algo);
struct cipher_algo *image_get_cipher_algo(const char *full_name);
-#ifdef CONFIG_FIT_VERBOSE
+#if CONFIG_IS_ENABLED(FIT_VERBOSE)
#define fit_unsupported(msg) printf("! %s:%d " \
"FIT images not supported for '%s'\n", \
__FILE__, __LINE__, (msg))
@@ -1470,7 +1469,7 @@ struct cipher_algo *image_get_cipher_algo(const char *full_name);
#else
#define fit_unsupported(msg)
#define fit_unsupported_reset(msg)
-#endif /* CONFIG_FIT_VERBOSE */
+#endif /* FIT_VERBOSE */
#endif /* CONFIG_FIT */
#if !defined(USE_HOSTCC)
diff --git a/tools/Kconfig b/tools/Kconfig
index 747d221803..9d1c0efd40 100644
--- a/tools/Kconfig
+++ b/tools/Kconfig
@@ -45,6 +45,11 @@ config TOOLS_FIT_SIGNATURE_MAX_SIZE
depends on TOOLS_FIT_SIGNATURE
default 0x10000000
+config TOOLS_FIT_VERBOSE
+ def_bool y
+ help
+ Support verbose FIT output in the tools builds
+
config TOOLS_MD5
def_bool y
help