Kconfig: Add SPM promptless config options
Change-Id: Ic79c14d0472e09c8e6ff997b4e423b440adfeb1d
Signed-off-by: Kevin Peng <kevin.peng@arm.com>
diff --git a/config/kconfig.cmake b/config/kconfig.cmake
index 92263ed..8dde3d3 100644
--- a/config/kconfig.cmake
+++ b/config/kconfig.cmake
@@ -278,21 +278,6 @@
include(${CMAKE_SOURCE_DIR}/config/build_type/${CMAKE_BUILD_TYPE_LOWERCASE}.cmake)
endif()
-# Load TF-M model specific default config
-# Load IPC backend config if isolation level is explicitly specified to 2/3 or IPC backend is
-# selected via build command line. Otherwise, load SFN backend config by default.
-# If a pair of invalid settings are passed via command line, it will be captured later via config
-# check.
-# Also select IPC model by default for multi-core platform unless it has already selected SFN model
-if((DEFINED TFM_ISOLATION_LEVEL AND TFM_ISOLATION_LEVEL GREATER 1) OR
- CONFIG_TFM_SPM_BACKEND STREQUAL "IPC" OR
- TFM_MULTI_CORE_TOPOLOGY)
- include(config/tfm_ipc_config_default.cmake)
-else()
- #The default backend is SFN
- include(config/tfm_sfn_config_default.cmake)
-endif()
-
# Load bl1 config
if(BL1 AND PLATFORM_DEFAULT_BL1)
include(${CMAKE_SOURCE_DIR}/bl1/config/bl1_config_default.cmake)
diff --git a/secure_fw/spm/Kconfig b/secure_fw/spm/Kconfig
index 845cdac..0a31556 100644
--- a/secure_fw/spm/Kconfig
+++ b/secure_fw/spm/Kconfig
@@ -22,6 +22,7 @@
config CONFIG_TFM_SPM_BACKEND_IPC
bool "IPC Backend"
+ select CONFIG_TFM_PARTITION_META
endchoice
config CONFIG_TFM_SPM_BACKEND
@@ -58,3 +59,18 @@
default n
depends on TFM_ISOLATION_LEVEL = 1
endmenu
+
+######################## Promptless (non-user) config options ##################
+########### Do NOT change the following config options anywhere! ###############
+config CONFIG_TFM_PARTITION_META
+ def_bool n
+
+config TFM_PARTITION_NS_AGENT_MAILBOX
+ bool
+ default y if TFM_MULTI_CORE_TOPOLOGY
+ default n
+
+config TFM_PARTITION_NS_AGENT_TZ
+ bool
+ default y if CONFIG_TFM_USE_TRUSTZONE
+ default n