samples: spm: Remove deleted console configs

Rely on DT instead.

Signed-off-by: Robert Lubos <[email protected]>

Author: rlubos

samples/CMakeLists.txt

@@ -24,6 +24,11 @@ if (CONFIG_SPM)
         spm
         ${NRF_DIR}/samples/spm/spm_ns_handler_from_spm_fault.conf
         )
+
+      add_overlay_dts(
+        mcuboot
+        ${NRF_DIR}/samples/spm/spm_uart.overlay
+      )
   endif()
 
   if (CONFIG_BOARD_ENABLE_CPUNET)

samples/spm/boards/nrf5340dk_nrf5340_cpuapp.overlay

@@ -10,13 +10,3 @@
 &pwm3 {
 	status = "okay";
 };
-
-&uart0 {
-	status = "okay";
-
-	spm_uart: nrf-spm-uart {
-		compatible = "nordic,nrf-spm-uart";
-		status = "okay";
-		label = "SPM_UART";
-	};
-};

samples/spm/boards/thingy91_nrf9160.overlay

@@ -16,6 +16,6 @@ tests:
       - nrf5340dk_nrf5340_cpuapp
       - nrf9160dk_nrf9160
     tags: ci_build
+    extra_args: DTC_OVERLAY_FILE="spm_uart.overlay"
     extra_configs:
       - CONFIG_SPM_SHARE_CONSOLE_UART=y
-      - CONFIG_UART_CONSOLE_ON_DEV_NAME="SPM_UART"

samples/spm/nrf9160dk_nrf9160.overlay

@@ -10,7 +10,6 @@
 # When enabled, spm can print to UARTE0 even after switching to non-secure, e.g.
 # from secure fault handler.
 CONFIG_SPM_SHARE_CONSOLE_UART=y
-CONFIG_UART_CONSOLE_ON_DEV_NAME="SPM_UART"
 
 # When enabled, spm, in fault handler, will call non-secure fatal error handler.
 CONFIG_SPM_SERVICE_NS_HANDLER_FROM_SPM_FAULT=y

samples/spm/sample.yaml

@@ -0,0 +1,34 @@
+/* SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */
+
+/ {
+	chosen {
+		zephyr,console = &spm_uart;
+	};
+};
+
+&uart0 {
+	status = "okay";
+
+	spm_uart: nrf-spm-uart {
+		compatible = "nordic,nrf-spm-uart";
+		status = "okay";
+		label = "SPM_UART";
+	};
+};
+
+/* This is a workaround for a problem that it's not possible to merge
+ * board-specific and DTC_OVERLAY_FILE defined overlays. Originally PWM was
+ * only enabled for nrf9160dk_nrf9160, but since enabling it only for that board
+ * would make spm_uart overlay selection problematic.
+ */
+&pwm1 {
+	status = "okay";
+};
+
+&pwm2 {
+	status = "okay";
+};
+
+&pwm3 {
+	status = "okay";
+};

samples/spm/spm_ns_handler_from_spm_fault.conf

@@ -65,7 +65,7 @@ static int spm_uart_init(const struct device *dev)
 	return 0;
 }
 
-DEVICE_DEFINE(spm_uart, DT_PROP(DT_NODELABEL(spm_uart), label), spm_uart_init,
-	      NULL, NULL, &spm_uart_config,
-	      PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEVICE,
-	      &spm_uart_api);
+DEVICE_DT_DEFINE(DT_NODELABEL(spm_uart), spm_uart_init,
+		 NULL, NULL, &spm_uart_config,
+		 PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEVICE,
+		 &spm_uart_api);