samples: matter: kconfig: Exclude disabling PM for non-secure builds

nordicjm · nordicjm · commit 66e170f1618f · 2026-01-15T11:10:04.000Z
TF-M is currently not supported without partition manager, do not
force disabling PM if a non-secure board target is used in samples
that build for these

Signed-off-by: Jamie McCrae &lt;jamie.mccrae@nordicsemi.no&gt;
diff --git a/samples/matter/closure/Kconfig.sysbuild b/samples/matter/closure/Kconfig.sysbuild
@@ -5,7 +5,8 @@
 #
 
 config PARTITION_MANAGER
-	default n if SOC_SERIES_NRF52X || SOC_NRF54L10 || SOC_NRF54L15 || SOC_NRF54LM20A
+	default n if (SOC_SERIES_NRF52X || SOC_NRF54L10 || SOC_NRF54L15 || SOC_NRF54LM20A) && \
+		!BOARD_IS_NON_SECURE
 
 #### Radio core selection
 config NRF_DEFAULT_IPC_RADIO
diff --git a/samples/matter/contact_sensor/Kconfig.sysbuild b/samples/matter/contact_sensor/Kconfig.sysbuild
@@ -5,7 +5,8 @@
 #
 
 config PARTITION_MANAGER
-	default n if SOC_SERIES_NRF52X || SOC_NRF54L10 || SOC_NRF54L15 || SOC_NRF54LM20A
+	default n if (SOC_SERIES_NRF52X || SOC_NRF54L10 || SOC_NRF54L15 || SOC_NRF54LM20A) && \
+		!BOARD_IS_NON_SECURE
 
 #### Radio core selection
 config NRF_DEFAULT_IPC_RADIO
diff --git a/samples/matter/light_bulb/Kconfig.sysbuild b/samples/matter/light_bulb/Kconfig.sysbuild
@@ -5,7 +5,8 @@
 #
 
 config PARTITION_MANAGER
-	default n if SOC_SERIES_NRF52X || SOC_NRF54L10 || SOC_NRF54L15 || SOC_NRF54LM20A
+	default n if (SOC_SERIES_NRF52X || SOC_NRF54L10 || SOC_NRF54L15 || SOC_NRF54LM20A) && \
+		!BOARD_IS_NON_SECURE
 
 # This config has to be enabled manually for variants with shields, because sysbuild does not support it.
 config WIFI_NRF70
diff --git a/samples/matter/light_switch/Kconfig.sysbuild b/samples/matter/light_switch/Kconfig.sysbuild
@@ -5,7 +5,8 @@
 #
 
 config PARTITION_MANAGER
-	default n if SOC_SERIES_NRF52X || SOC_NRF54L10 || SOC_NRF54L15 || SOC_NRF54LM20A
+	default n if (SOC_SERIES_NRF52X || SOC_NRF54L10 || SOC_NRF54L15 || SOC_NRF54LM20A) && \
+		!BOARD_IS_NON_SECURE
 
 # This config has to be enabled manually for variants with shields, because sysbuild does not support it.
 config WIFI_NRF70
diff --git a/samples/matter/lock/Kconfig.sysbuild b/samples/matter/lock/Kconfig.sysbuild
@@ -5,7 +5,8 @@
 #
 
 config PARTITION_MANAGER
-	default n if SOC_SERIES_NRF52X || SOC_NRF54L10 || SOC_NRF54L15 || SOC_NRF54LM20A
+	default n if (SOC_SERIES_NRF52X || SOC_NRF54L10 || SOC_NRF54L15 || SOC_NRF54LM20A) && \
+		!BOARD_IS_NON_SECURE
 
 # This config has to be enabled manually for variants with shields, because sysbuild does not support it.
 config WIFI_NRF70
diff --git a/samples/matter/manufacturer_specific/Kconfig.sysbuild b/samples/matter/manufacturer_specific/Kconfig.sysbuild
@@ -5,7 +5,8 @@
 #
 
 config PARTITION_MANAGER
-	default n if SOC_SERIES_NRF52X || SOC_NRF54L10 || SOC_NRF54L15 || SOC_NRF54LM20A
+	default n if (SOC_SERIES_NRF52X || SOC_NRF54L10 || SOC_NRF54L15 || SOC_NRF54LM20A) && \
+		!BOARD_IS_NON_SECURE
 
 # This config has to be enabled manually for variants with shields, because sysbuild does not support it.
 config WIFI_NRF70
diff --git a/samples/matter/smoke_co_alarm/Kconfig.sysbuild b/samples/matter/smoke_co_alarm/Kconfig.sysbuild
@@ -5,7 +5,8 @@
 #
 
 config PARTITION_MANAGER
-	default n if SOC_SERIES_NRF52X || SOC_NRF54L10 || SOC_NRF54L15 || SOC_NRF54LM20A
+	default n if (SOC_SERIES_NRF52X || SOC_NRF54L10 || SOC_NRF54L15 || SOC_NRF54LM20A) && \
+		!BOARD_IS_NON_SECURE
 
 #### Radio core selection
 config NRF_DEFAULT_IPC_RADIO
diff --git a/samples/matter/temperature_sensor/Kconfig.sysbuild b/samples/matter/temperature_sensor/Kconfig.sysbuild
@@ -5,7 +5,8 @@
 #
 
 config PARTITION_MANAGER
-	default n if SOC_SERIES_NRF52X || SOC_NRF54L10 || SOC_NRF54L15 || SOC_NRF54LM20A
+	default n if (SOC_SERIES_NRF52X || SOC_NRF54L10 || SOC_NRF54L15 || SOC_NRF54LM20A) && \
+		!BOARD_IS_NON_SECURE
 
 #### Radio core selection
 config NRF_DEFAULT_IPC_RADIO
diff --git a/samples/matter/template/Kconfig.sysbuild b/samples/matter/template/Kconfig.sysbuild
@@ -5,7 +5,8 @@
 #
 
 config PARTITION_MANAGER
-	default n if SOC_SERIES_NRF52X || SOC_NRF54L10 || SOC_NRF54L15 || SOC_NRF54LM20A
+	default n if (SOC_SERIES_NRF52X || SOC_NRF54L10 || SOC_NRF54L15 || SOC_NRF54LM20A) && \
+		!BOARD_IS_NON_SECURE
 
 # This config has to be enabled manually for variants with shields, because sysbuild does not support it.
 config WIFI_NRF70
diff --git a/samples/matter/thermostat/Kconfig.sysbuild b/samples/matter/thermostat/Kconfig.sysbuild
@@ -5,7 +5,8 @@
 #
 
 config PARTITION_MANAGER
-	default n if SOC_SERIES_NRF52X || SOC_NRF54L10 || SOC_NRF54L15 || SOC_NRF54LM20A
+	default n if (SOC_SERIES_NRF52X || SOC_NRF54L10 || SOC_NRF54L15 || SOC_NRF54LM20A) && \
+		!BOARD_IS_NON_SECURE
 
 # This config has to be enabled manually for variants with shields, because sysbuild does not support it.
 config WIFI_NRF70
diff --git a/samples/matter/window_covering/Kconfig.sysbuild b/samples/matter/window_covering/Kconfig.sysbuild
@@ -5,7 +5,8 @@
 #
 
 config PARTITION_MANAGER
-	default n if SOC_SERIES_NRF52X || SOC_NRF54L10 || SOC_NRF54L15 || SOC_NRF54LM20A
+	default n if (SOC_SERIES_NRF52X || SOC_NRF54L10 || SOC_NRF54L15 || SOC_NRF54LM20A) && \
+		!BOARD_IS_NON_SECURE
 
 #### Radio core selection
 config NRF_DEFAULT_IPC_RADIO

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,8 @@`
`5`	`5`	`#`
`6`	`6`
`7`	`7`	`config PARTITION_MANAGER`
`8`		`- default n if SOC_SERIES_NRF52X \|\| SOC_NRF54L10 \|\| SOC_NRF54L15 \|\| SOC_NRF54LM20A`
	`8`	`+ default n if (SOC_SERIES_NRF52X \|\| SOC_NRF54L10 \|\| SOC_NRF54L15 \|\| SOC_NRF54LM20A) && \`
	`9`	`+ !BOARD_IS_NON_SECURE`
`9`	`10`
`10`	`11`	`#### Radio core selection`
`11`	`12`	`config NRF_DEFAULT_IPC_RADIO`