Add a host Kconfig for FIT_VERBOSE. With this we can use CONFIG_IS_ENABLED(FIT_VERBOSE) directly in the host build, so drop the forcing of this in the image.h header.
Signed-off-by: Simon Glass sjg@chromium.org ---
(no changes since v1)
include/image.h | 5 ++--- tools/Kconfig | 5 +++++ 2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/include/image.h b/include/image.h index bdf19a4cc04..b08ae2bb6c0 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_ENABLE_RSASSA_PSS_SUPPORT 1
#define IMAGE_ENABLE_IGNORE 0 @@ -1509,7 +1508,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)) @@ -1521,7 +1520,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 c67dc04f5ed..6d0f4565a80 100644 --- a/tools/Kconfig +++ b/tools/Kconfig @@ -54,6 +54,11 @@ config HOST_FIT_SIGNATURE_MAX_SIZE depends on HOST_FIT_SIGNATURE default 0x10000000
+config HOST_FIT_VERBOSE + def_bool y + help + Support verbose FIT output in the host build + config HOST_OF_LIBFDT def_bool y help