spl: FIT: Make SPL_LOAD_FIT_FULL depend on SPL_LOAD_FIT

Today, only a few platforms enable SPL_LOAD_FIT_FULL, and all enable
SPL_LOAD_FIT. As can be seen in usage, the FULL symbol is a superset of
the first symbol, not an alternative. Update Kconfig entries based on
this and simplify the only code which checks for either being set.

Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/boot/Kconfig b/boot/Kconfig
index eff05948b3a1b1a410e3705354a033484af1bf86..022ec05de0a007677ca8b3111559a5601d36be05 100644 (file)
--- a/boot/Kconfig
+++ b/boot/Kconfig
@@ -204,7 +204,7 @@ config SPL_FIT_FULL_CHECK
 config SPL_FIT_SIGNATURE
        bool "Enable signature verification of FIT firmware within SPL"
        depends on SPL_DM
-       depends on SPL_LOAD_FIT || SPL_LOAD_FIT_FULL
+       depends on SPL_LOAD_FIT
        select FIT_SIGNATURE
        select SPL_FIT
        select SPL_CRYPTO
@@ -282,7 +282,7 @@ config SPL_LOAD_FIT_APPLY_OVERLAY_BUF_SZ
 
 config SPL_LOAD_FIT_FULL
        bool "Enable SPL loading U-Boot as a FIT (full fitImage features)"
-       select SPL_FIT
+       depends on SPL_LOAD_FIT
        help
          Normally with the SPL framework a legacy image is generated as part
          of the build. This contains U-Boot along with information as to

diff --git a/common/spl/Kconfig b/common/spl/Kconfig
index 4c8af85d5cc8b0591a9efd54d9af05026aea5c7f..a669c80941d4fef7ebd74af4e3507573f36e0705 100644 (file)
--- a/common/spl/Kconfig
+++ b/common/spl/Kconfig
@@ -1573,7 +1573,7 @@ config SPL_AM33XX_ENABLE_RTC32K_OSC
 config SPL_OPTEE_IMAGE
        bool "Support OP-TEE Trusted OS image in SPL"
        depends on ARM
-       depends on SPL_LOAD_FIT || SPL_LOAD_FIT_FULL
+       depends on SPL_LOAD_FIT
        help
          OP-TEE is an open source Trusted OS which is loaded by SPL.
          More detail at: https://github.com/OP-TEE/optee_os

diff --git a/include/test/spl.h b/include/test/spl.h
index 5fd28d927064412ac3d7841125647523a12d7ee5..c5349b06e290e7bfbc9af581de5c26816401a94c 100644 (file)
--- a/include/test/spl.h
+++ b/include/test/spl.h
@@ -133,8 +133,7 @@ static inline bool image_supported(enum spl_test_image type)
                return IS_ENABLED(CONFIG_SPL_LOAD_IMX_CONTAINER);
        case FIT_INTERNAL:
        case FIT_EXTERNAL:
-               return IS_ENABLED(CONFIG_SPL_LOAD_FIT) ||
-                      IS_ENABLED(CONFIG_SPL_LOAD_FIT_FULL);
+               return IS_ENABLED(CONFIG_SPL_LOAD_FIT);
        }
 
        return false;