SPL_FIT obviously requires libfdt in SPL, so let Kconfig express that by selecting SPL_OF_LIBFDT. Also make the actual options that users want (SPL signature and SPL FIT loading) visible in the menu and let them select the SPL_FIT as a requirement. Also remove the now redundant SPL_OF_LIBFDT from those Kconfigs that had it in for the SPL FIT loading feature.
Signed-off-by: Andre Przywara andre.przywara@arm.com --- Kconfig | 4 +++- configs/am335x_evm_defconfig | 1 - configs/evb-rk3399_defconfig | 1 - 3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Kconfig b/Kconfig index e0744d1..a2f45d3 100644 --- a/Kconfig +++ b/Kconfig @@ -208,15 +208,17 @@ config FIT_IMAGE_POST_PROCESS config SPL_FIT bool "Support Flattened Image Tree within SPL" depends on SPL + select SPL_OF_LIBFDT
config SPL_FIT_SIGNATURE bool "Enable signature verification of FIT firmware within SPL" - depends on SPL_FIT depends on SPL_DM + select SPL_FIT select SPL_RSA
config SPL_LOAD_FIT bool "Enable SPL loading U-Boot as a FIT" + select SPL_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/configs/am335x_evm_defconfig b/configs/am335x_evm_defconfig index ab7b9aa..525d07e 100644 --- a/configs/am335x_evm_defconfig +++ b/configs/am335x_evm_defconfig @@ -57,4 +57,3 @@ CONFIG_G_DNL_MANUFACTURER="Texas Instruments" CONFIG_G_DNL_VENDOR_NUM=0x0451 CONFIG_G_DNL_PRODUCT_NUM=0xd022 CONFIG_RSA=y -CONFIG_SPL_OF_LIBFDT=y diff --git a/configs/evb-rk3399_defconfig b/configs/evb-rk3399_defconfig index bedc1fd..8cae666 100644 --- a/configs/evb-rk3399_defconfig +++ b/configs/evb-rk3399_defconfig @@ -4,7 +4,6 @@ CONFIG_ROCKCHIP_RK3399=y CONFIG_DEFAULT_DEVICE_TREE="rk3399-evb" CONFIG_FIT=y CONFIG_SPL_LOAD_FIT=y -CONFIG_SPL_OF_LIBFDT=y CONFIG_SPL_ATF_SUPPORT=y CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x200 CONFIG_SPL_ATF_TEXT_BASE=0x00010000