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 <[email protected]> --- boot/Kconfig | 4 ++-- common/spl/Kconfig | 2 +- include/test/spl.h | 3 +-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/boot/Kconfig b/boot/Kconfig index f21a67b2d3ee..8de99981b306 100644 --- 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 63f6f8d962fa..458dce01700a 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -1574,7 +1574,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 5fd28d927064..c5349b06e290 100644 --- 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; -- 2.43.0
