boards: arm: Select TF-M symbols via Kconfig instead of defconfig

nordicjm · nashif · commit c620646ec5c7 · 2025-09-13T18:13:49.000-04:00
This forces a build to fail should it select a symbol that cannot
be selected (if the prerequisites cannot be met) instead of
silently ignoring it and allowing an invalid build to complete

Signed-off-by: Jamie McCrae &lt;jamie.mccrae@nordicsemi.no&gt;
diff --git a/boards/arm/mps2/Kconfig b/boards/arm/mps2/Kconfig
@@ -5,3 +5,4 @@
 config BOARD_MPS2
 	select HAS_COVERAGE_SUPPORT
 	select QEMU_TARGET if BOARD_MPS2_AN385 || BOARD_MPS2_AN521_CPU0 || BOARD_MPS2_AN521_CPU0_NS || BOARD_MPS2_AN521_CPU1
+	select TRUSTED_EXECUTION_NONSECURE if BOARD_MPS2_AN521_CPU0_NS
diff --git a/boards/arm/mps2/mps2_an521_cpu0_ns_defconfig b/boards/arm/mps2/mps2_an521_cpu0_ns_defconfig
@@ -16,6 +16,3 @@ CONFIG_GPIO=y
 CONFIG_CONSOLE=y
 CONFIG_UART_CONSOLE=y
 CONFIG_SERIAL=y
-
-# Build a non-secure firmware image
-CONFIG_TRUSTED_EXECUTION_NONSECURE=y
diff --git a/boards/arm/mps3/Kconfig b/boards/arm/mps3/Kconfig
@@ -4,3 +4,7 @@
 
 config BOARD_MPS3
 	select QEMU_TARGET if BOARD_MPS3_CORSTONE300_AN547 || BOARD_MPS3_CORSTONE300_AN547_NS
+	select TRUSTED_EXECUTION_NONSECURE if BOARD_MPS3_CORSTONE300_AN547_NS || \
+		BOARD_MPS3_CORSTONE300_AN552_NS || BOARD_MPS3_CORSTONE300_FVP_NS || \
+		BOARD_MPS3_CORSTONE310_AN555_NS || BOARD_MPS3_CORSTONE310_FVP_NS
+	select BUILD_WITH_TFM if BOARD_MPS3_CORSTONE310_FVP_NS || BOARD_MPS3_CORSTONE300_FVP_NS
diff --git a/boards/arm/mps3/mps3_corstone300_an547_ns_defconfig b/boards/arm/mps3/mps3_corstone300_an547_ns_defconfig
@@ -17,7 +17,3 @@ CONFIG_GPIO=y
 CONFIG_CONSOLE=y
 CONFIG_UART_CONSOLE=y
 CONFIG_SERIAL=y
-
-# Build a Non-secure firmware image
-CONFIG_TRUSTED_EXECUTION_SECURE=n
-CONFIG_TRUSTED_EXECUTION_NONSECURE=y
diff --git a/boards/arm/mps3/mps3_corstone300_an552_ns_defconfig b/boards/arm/mps3/mps3_corstone300_an552_ns_defconfig
@@ -12,7 +12,3 @@ CONFIG_GPIO=y
 CONFIG_CONSOLE=y
 CONFIG_UART_CONSOLE=y
 CONFIG_SERIAL=y
-
-# Build a Non-secure firmware image
-CONFIG_TRUSTED_EXECUTION_SECURE=n
-CONFIG_TRUSTED_EXECUTION_NONSECURE=y
diff --git a/boards/arm/mps3/mps3_corstone300_fvp_ns_defconfig b/boards/arm/mps3/mps3_corstone300_fvp_ns_defconfig
@@ -12,9 +12,3 @@ CONFIG_GPIO=y
 CONFIG_CONSOLE=y
 CONFIG_UART_CONSOLE=y
 CONFIG_SERIAL=y
-
-# Build a Non-secure firmware image
-CONFIG_TRUSTED_EXECUTION_SECURE=n
-CONFIG_TRUSTED_EXECUTION_NONSECURE=y
-
-CONFIG_BUILD_WITH_TFM=y
diff --git a/boards/arm/mps3/mps3_corstone310_an555_ns_defconfig b/boards/arm/mps3/mps3_corstone310_an555_ns_defconfig
@@ -12,7 +12,3 @@ CONFIG_GPIO=y
 CONFIG_CONSOLE=y
 CONFIG_UART_CONSOLE=y
 CONFIG_SERIAL=y
-
-# Build a Non-secure firmware image
-CONFIG_TRUSTED_EXECUTION_SECURE=n
-CONFIG_TRUSTED_EXECUTION_NONSECURE=y
diff --git a/boards/arm/mps3/mps3_corstone310_fvp_ns_defconfig b/boards/arm/mps3/mps3_corstone310_fvp_ns_defconfig
@@ -12,8 +12,3 @@ CONFIG_GPIO=y
 CONFIG_CONSOLE=y
 CONFIG_UART_CONSOLE=y
 CONFIG_SERIAL=y
-
-# Build a Non-secure firmware image
-CONFIG_TRUSTED_EXECUTION_SECURE=n
-CONFIG_TRUSTED_EXECUTION_NONSECURE=y
-CONFIG_BUILD_WITH_TFM=y
diff --git a/boards/arm/mps4/Kconfig b/boards/arm/mps4/Kconfig
@@ -0,0 +1,6 @@
+# Copyright (c) 2025 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_MPS4
+	select BUILD_WITH_TFM if BOARD_MPS4_CORSTONE315_FVP_NS || BOARD_MPS4_CORSTONE320_FVP_NS
+	select TRUSTED_EXECUTION_NONSECURE if BOARD_MPS4_CORSTONE315_FVP_NS || BOARD_MPS4_CORSTONE320_FVP_NS
diff --git a/boards/arm/mps4/mps4_corstone315_fvp_ns_defconfig b/boards/arm/mps4/mps4_corstone315_fvp_ns_defconfig
@@ -12,8 +12,3 @@ CONFIG_GPIO=y
 CONFIG_CONSOLE=y
 CONFIG_UART_CONSOLE=y
 CONFIG_SERIAL=y
-
-# Build a Non-secure firmware image
-CONFIG_TRUSTED_EXECUTION_SECURE=n
-CONFIG_TRUSTED_EXECUTION_NONSECURE=y
-CONFIG_BUILD_WITH_TFM=y
diff --git a/boards/arm/mps4/mps4_corstone320_fvp_ns_defconfig b/boards/arm/mps4/mps4_corstone320_fvp_ns_defconfig
@@ -12,8 +12,3 @@ CONFIG_GPIO=y
 CONFIG_CONSOLE=y
 CONFIG_UART_CONSOLE=y
 CONFIG_SERIAL=y
-
-# Build a Non-secure firmware image
-CONFIG_TRUSTED_EXECUTION_SECURE=n
-CONFIG_TRUSTED_EXECUTION_NONSECURE=y
-CONFIG_BUILD_WITH_TFM=y
diff --git a/boards/arm/v2m_musca_b1/Kconfig b/boards/arm/v2m_musca_b1/Kconfig
@@ -0,0 +1,5 @@
+# Copyright (c) 2025 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_V2M_MUSCA_B1
+	select TRUSTED_EXECUTION_NONSECURE if BOARD_V2M_MUSCA_B1_MUSCA_B1_NS
diff --git a/boards/arm/v2m_musca_b1/v2m_musca_b1_musca_b1_ns_defconfig b/boards/arm/v2m_musca_b1/v2m_musca_b1_musca_b1_ns_defconfig
@@ -12,5 +12,3 @@ CONFIG_ARM_MPU=y
 CONFIG_CONSOLE=y
 CONFIG_UART_CONSOLE=y
 CONFIG_SERIAL=y
-
-CONFIG_TRUSTED_EXECUTION_NONSECURE=y
diff --git a/boards/arm/v2m_musca_s1/Kconfig b/boards/arm/v2m_musca_s1/Kconfig
@@ -0,0 +1,5 @@
+# Copyright (c) 2025 Nordic Semiconductor ASA
+# SPDX-License-Identifier: Apache-2.0
+
+config BOARD_V2M_MUSCA_S1
+	select TRUSTED_EXECUTION_NONSECURE if BOARD_V2M_MUSCA_S1_MUSCA_S1_NS
diff --git a/boards/arm/v2m_musca_s1/v2m_musca_s1_musca_s1_ns_defconfig b/boards/arm/v2m_musca_s1/v2m_musca_s1_musca_s1_ns_defconfig
@@ -12,5 +12,3 @@ CONFIG_ARM_MPU=y
 CONFIG_CONSOLE=y
 CONFIG_UART_CONSOLE=y
 CONFIG_SERIAL=y
-
-CONFIG_TRUSTED_EXECUTION_NONSECURE=y
