Kconfig: Add BL1 and BL2 Kconfig configs
bl1/Kconfig and bl2/ext/mcuboot/Kconfig are based on related
CMAKE config files. As these two modules join into the Kconfig
menu, CMAKE include process in kconfig.cmake can be dropped.
Signed-off-by: Jianliang Shen <jianliang.shen@arm.com>
Change-Id: I288fabab9adb66028125fa0b7065e2e39e2420a5
diff --git a/config/check_config.cmake b/config/check_config.cmake
index 3b3be77..482236f 100644
--- a/config/check_config.cmake
+++ b/config/check_config.cmake
@@ -52,7 +52,7 @@
########################## BL2 #################################################
get_property(MCUBOOT_STRATEGY_LIST CACHE MCUBOOT_UPGRADE_STRATEGY PROPERTY STRINGS)
-tfm_invalid_config(BL2 AND (NOT MCUBOOT_UPGRADE_STRATEGY IN_LIST MCUBOOT_STRATEGY_LIST))
+tfm_invalid_config(BL2 AND (NOT MCUBOOT_UPGRADE_STRATEGY IN_LIST MCUBOOT_STRATEGY_LIST) AND NOT USE_KCONFIG_TOOL)
# Maximum number of MCUBoot images supported by TF-M NV counters and ROTPKs
tfm_invalid_config(MCUBOOT_IMAGE_NUMBER GREATER 4)
@@ -61,7 +61,7 @@
tfm_invalid_config((NOT (TFM_PARTITION_FIRMWARE_UPDATE OR CONFIG_TFM_BOOT_STORE_MEASUREMENTS)) AND MCUBOOT_DATA_SHARING)
get_property(MCUBOOT_ALIGN_VAL_LIST CACHE MCUBOOT_ALIGN_VAL PROPERTY STRINGS)
-tfm_invalid_config(BL2 AND (NOT MCUBOOT_ALIGN_VAL IN_LIST MCUBOOT_ALIGN_VAL_LIST))
+tfm_invalid_config(BL2 AND (NOT MCUBOOT_ALIGN_VAL IN_LIST MCUBOOT_ALIGN_VAL_LIST) AND NOT USE_KCONFIG_TOOL)
####################### Code sharing ###########################################
diff --git a/config/kconfig.cmake b/config/kconfig.cmake
index 8dde3d3..54a9318 100644
--- a/config/kconfig.cmake
+++ b/config/kconfig.cmake
@@ -278,16 +278,6 @@
include(${CMAKE_SOURCE_DIR}/config/build_type/${CMAKE_BUILD_TYPE_LOWERCASE}.cmake)
endif()
-# Load bl1 config
-if(BL1 AND PLATFORM_DEFAULT_BL1)
- include(${CMAKE_SOURCE_DIR}/bl1/config/bl1_config_default.cmake)
-endif()
-
-# Load MCUboot specific default.cmake
-if(NOT DEFINED BL2 OR BL2)
- include(${CMAKE_SOURCE_DIR}/bl2/ext/mcuboot/mcuboot_default_config.cmake)
-endif()
-
# Include FWU partition configs.
include(config/tfm_fwu_config.cmake)