image: Add Kconfig options for FIT in the tools build

In preparation for enabling CONFIG_IS_ENABLED() on the host build, add
some options to enable the various FIT options expected in these tools.
This will ensure that the code builds correctly when CONFIG_TOOLS_xxx
is distinct from CONFIG_xxx.

Drop some #ifdefs which are immediately unnecessary (many more are in
later patches).

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
Reviewed-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>

diff --git a/common/image-fit-sig.c b/common/image-fit-sig.c
index b979cd2a4b607df0954935d95a1f33cd59da2fa0..e95e64bd2fe92da8b14e2e84445dec837ff2979d 100644 (file)
--- a/common/image-fit-sig.c
+++ b/common/image-fit-sig.c
@@ -72,11 +72,12 @@ static int fit_image_setup_verify(struct image_sign_info *info,
        char *algo_name;
        const char *padding_name;
 
+#ifndef USE_HOSTCC
        if (fdt_totalsize(fit) > CONFIG_FIT_SIGNATURE_MAX_SIZE) {
                *err_msgp = "Total size too large";
                return 1;
        }
-
+#endif
        if (fit_image_hash_get_algo(fit, noffset, &algo_name)) {
                *err_msgp = "Can't get hash algo property";
                return -1;

diff --git a/common/image-fit.c b/common/image-fit.c
index 6f8e67e4158d8c0167a287ab8af4527ea1cad669..17c6d4e7813bfc6930f419f048162eee213c3e1f 100644 (file)
--- a/common/image-fit.c
+++ b/common/image-fit.c
@@ -170,7 +170,7 @@ int fit_get_subimage_count(const void *fit, int images_noffset)
        return count;
 }
 
-#if CONFIG_IS_ENABLED(FIT_PRINT) || CONFIG_IS_ENABLED(SPL_FIT_PRINT)
+#if CONFIG_IS_ENABLED(FIT_PRINT)
 /**
  * fit_image_print_data() - prints out the hash node details
  * @fit: pointer to the FIT format image header
@@ -578,7 +578,7 @@ void fit_image_print(const void *fit, int image_noffset, const char *p)
 #else
 void fit_print_contents(const void *fit) { }
 void fit_image_print(const void *fit, int image_noffset, const char *p) { }
-#endif /* CONFIG_IS_ENABLED(FIR_PRINT) || CONFIG_IS_ENABLED(SPL_FIT_PRINT) */
+#endif /* CONFIG_IS_ENABLED(FIT_PRINT) */
 
 /**
  * fit_get_desc - get node description property

diff --git a/tools/Kconfig b/tools/Kconfig
index d6f82cd949b5570b9f55bfb1cdf9d2f3bddc5762..ea986ab0479afb1ec8747dbda6a6adac75498971 100644 (file)
--- a/tools/Kconfig
+++ b/tools/Kconfig
@@ -20,4 +20,29 @@ config TOOLS_LIBCRYPTO
          This selection does not affect target features, such as runtime FIT
          signature verification.
 
+config TOOLS_FIT
+       def_bool y
+       help
+         Enable FIT support in the tools builds.
+
+config TOOLS_FIT_FULL_CHECK
+       def_bool y
+       help
+         Do a full check of the FIT before using it in the tools builds
+
+config TOOLS_FIT_PRINT
+       def_bool y
+       help
+         Print the content of the FIT verbosely in the tools builds
+
+config TOOLS_FIT_SIGNATURE
+       def_bool y
+       help
+         Enable signature verification of FIT uImages in the tools builds
+
+config TOOLS_FIT_SIGNATURE_MAX_SIZE
+       hex
+       depends on TOOLS_FIT_SIGNATURE
+       default 0x10000000
+
 endmenu