Kconfig: Create a menu for FIT

This is a major feature with a lot of options. Give it its own menu to
tidy up the 'make menuconfig' display. Drop the 'depends on FIT' pieces
which are now unnecessary, since they are now bracketed by an 'if FIT'.

Leave CONFIG_TIMESTAMP out since it affects legacy images too.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>

diff --git a/boot/Kconfig b/boot/Kconfig
index 017f7117d57f8660dc7d60647ac7f8f78e7f0732..99a2ffca2fc65ea5a28450e407507ccb299d85eb 100644 (file)
--- a/boot/Kconfig
+++ b/boot/Kconfig
@@ -9,8 +9,19 @@ config ANDROID_BOOT_IMAGE
          This enables support for booting images which use the Android
          image format header.
 
-config FIT
-       bool "Support Flattened Image Tree"
+config TIMESTAMP
+       bool "Show image date and time when displaying image information"
+       default y if CMD_DATE
+       help
+         When CONFIG_TIMESTAMP is selected, the timestamp (date and time) of
+         an image is printed by image commands like bootm or iminfo. This
+         is shown as 'Timestamp: xxx' and 'Created: xxx'. If this option is
+         enabled, then U-Boot requires FITs to have a timestamp. If a FIT is
+         loaded that does not, the message 'Wrong FIT format: no timestamp'
+         is shown.
+
+menuconfig FIT
+       bool "Flattened Image Tree (FIT)"
        select HASH
        select MD5
        select SHA1
@@ -25,20 +36,10 @@ config FIT
          multiple configurations, verification through hashing and also
          verified boot (secure boot using RSA).
 
-config TIMESTAMP
-       bool "Show image date and time when displaying image information"
-       default y if CMD_DATE
-       help
-         When CONFIG_TIMESTAMP is selected, the timestamp (date and time) of
-         an image is printed by image commands like bootm or iminfo. This
-         is shown as 'Timestamp: xxx' and 'Created: xxx'. If this option is
-         enabled, then U-Boot requires FITs to have a timestamp. If a FIT is
-         loaded that does not, the message 'Wrong FIT format: no timestamp'
-         is shown.
+if FIT
 
 config FIT_EXTERNAL_OFFSET
        hex "FIT external data offset"
-       depends on FIT
        default 0x0
        help
          This specifies a data offset in fit image.
@@ -49,7 +50,6 @@ config FIT_EXTERNAL_OFFSET
 
 config FIT_FULL_CHECK
        bool "Do a full check of the FIT before using it"
-       depends on FIT
        default y
        help
          Enable this do a full check of the FIT to make sure it is valid. This
@@ -59,7 +59,7 @@ config FIT_FULL_CHECK
 
 config FIT_SIGNATURE
        bool "Enable signature verification of FIT uImages"
-       depends on DM && FIT
+       depends on DM
        select HASH
        imply RSA
        imply RSA_VERIFY
@@ -97,7 +97,7 @@ config FIT_RSASSA_PSS
 
 config FIT_CIPHER
        bool "Enable ciphering data in a FIT uImages"
-       depends on DM && FIT
+       depends on DM
        select AES
        help
          Enable the feature of data ciphering/unciphering in the tool mkimage
@@ -105,7 +105,6 @@ config FIT_CIPHER
 
 config FIT_VERBOSE
        bool "Show verbose messages when FIT images fail"
-       depends on FIT
        help
          Generally a system will have valid FIT images so debug messages
          are a waste of code space. If you are debugging your images then
@@ -114,7 +113,6 @@ config FIT_VERBOSE
 
 config FIT_BEST_MATCH
        bool "Select the best match for the kernel device tree"
-       depends on FIT
        help
          When no configuration is explicitly selected, default to the
          one whose fdt's compatibility field best matches that of
@@ -124,7 +122,6 @@ config FIT_BEST_MATCH
 
 config FIT_IMAGE_POST_PROCESS
        bool "Enable post-processing of FIT artifacts after loading by U-Boot"
-       depends on FIT
        depends on SOCFPGA_SECURE_VAB_AUTH
        help
          Allows doing any sort of manipulation to blobs after they got extracted
@@ -139,11 +136,12 @@ config FIT_IMAGE_POST_PROCESS
 
 config FIT_PRINT
         bool "Support FIT printing"
-       depends on FIT
         default y
         help
           Support printing the content of the fitImage in a verbose manner.
 
+endif # FIT
+
 config SPL_FIT
        bool "Support Flattened Image Tree within SPL"
        depends on SPL && FIT