samples: matter: Switch Matter Tempate sample to non-PM build

Refactored Matter Temple sample to non-Partition Manager
build. Aligned all images and board files.

Signed-off-by: Arkadiusz Balys <arkadiusz.balys@nordicsemi.no>

Author: ArekBalysNordic

samples/matter/template/Kconfig.sysbuild

@@ -36,9 +36,6 @@ config DFU_MULTI_IMAGE_PACKAGE_BUILD
 config DFU_MULTI_IMAGE_PACKAGE_APP
 	default y
 
-config PM_EXTERNAL_FLASH_MCUBOOT_SECONDARY
-	default y
-
 #### DFU network core configuration
 if SOC_SERIES_NRF53
 
@@ -61,22 +58,6 @@ config DFU_MULTI_IMAGE_PACKAGE_NET
 
 endif # SOC_SERIES_NRF53
 
-if BOARD_NRF54L15DK || BOARD_NRF54LM20DK
-
-# Disable checking the external drivers for nRF54L15 and nRF54LM20 DKs.
-config PM_OVERRIDE_EXTERNAL_DRIVER_CHECK
-	default y
-
-endif # BOARD_NRF54L15DK || BOARD_NRF54LM20DK
-
-# Mcuboot padding size is modified to 0x1000 in pm_static file.
-if SOC_NRF54L10
-
-config PM_MCUBOOT_PAD
-	default 0x1000
-
-endif # SOC_NRF54L10
-
 endif # BOOTLOADER_MCUBOOT
 
 # Store the Wi-Fi firmware patch on external flash by default for nRF5340 with nRF7002
@@ -99,19 +80,50 @@ config MATTER_FACTORY_DATA_GENERATE
 # Internal flash only for nRF54L15 tag with compression
 if BOARD_NRF54L15TAG
 
+choice MCUBOOT_MODE
+	default MCUBOOT_MODE_OVERWRITE_ONLY
+endchoice
+
+config MCUBOOT_COMPRESSED_IMAGE_SUPPORT
+	default y
+
+endif
+
+# Partition Manager backwards compatibility
+if PARTITION_MANAGER
+
+if SOC_NRF54L10
+
+config PM_MCUBOOT_PAD
+	default 0x1000
+
+endif # SOC_NRF54L10
+
+if BOARD_NRF54L15TAG
+
 config PM_OVERRIDE_EXTERNAL_DRIVER_CHECK
 	default y
 
 config PM_EXTERNAL_FLASH_MCUBOOT_SECONDARY
 	default y
 
-choice MCUBOOT_MODE
-	default MCUBOOT_MODE_OVERWRITE_ONLY
-endchoice
+endif # BOARD_NRF54L15TAG
 
-config MCUBOOT_COMPRESSED_IMAGE_SUPPORT
+if BOARD_NRF54L15DK || BOARD_NRF54LM20DK
+
+# Disable checking the external drivers for nRF54L15 and nRF54LM20 DKs.
+config PM_OVERRIDE_EXTERNAL_DRIVER_CHECK
 	default y
 
-endif
+endif # BOARD_NRF54L15DK || BOARD_NRF54LM20DK
+
+if BOOTLOADER_MCUBOOT
+
+config PM_EXTERNAL_FLASH_MCUBOOT_SECONDARY
+	default y
+
+endif # BOOTLOADER_MCUBOOT
+
+endif # PARTITION_MANAGER
 
 source "share/sysbuild/Kconfig"

samples/matter/template/boards/nrf52840dk_nrf52840.overlay

@@ -4,12 +4,18 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
+#include <samples/matter/nrf52840_partitions.dtsi>
+
 / {
 	chosen {
 		nordic,pm-ext-flash = &mx25r64;
 	};
 };
 
+&mx25r64 {
+	status = "okay";
+};
+
 /* Disable unused peripherals to reduce power consumption */
 &adc {
 	status = "disabled";

samples/matter/template/boards/nrf5340dk_nrf5340_cpuapp.overlay

@@ -4,17 +4,22 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
+#include <samples/matter/nrf5340_cpuapp_partitions.dtsi>
 #include <zephyr/dt-bindings/ipc_service/static_vrings.h>
 
+/* Set IPC thread priority to the highest value to not collide with other threads. */
+&ipc0 {
+	zephyr,priority = <0 PRIO_COOP>;
+};
+
 / {
 	chosen {
 		nordic,pm-ext-flash = &mx25r64;
 	};
 };
 
-/* Set IPC thread priority to the highest value to not collide with other threads. */
-&ipc0 {
-	zephyr,priority = <0 PRIO_COOP>;
+&mx25r64 {
+	status = "okay";
 };
 
 /* Disable unused peripherals to reduce power consumption */

samples/matter/template/boards/nrf54l15dk_nrf54l10_cpuapp.overlay

@@ -4,6 +4,8 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
+#include <samples/matter/nrf54l10_cpuapp_partitions.dtsi>
+
 / {
 	aliases {
 		/* Use watchdog wdt31 as the application watchdog */
@@ -15,16 +17,6 @@
 	};
 };
 
-/* restore full RRAM and SRAM space - by default some parts are dedicated to FLRP */
-&cpuapp_rram {
-	reg = <0x0 DT_SIZE_K(1012)>;
-};
-
-&cpuapp_sram {
-	reg = <0x20000000 DT_SIZE_K(192)>;
-	ranges = <0x0 0x20000000 DT_SIZE_K(192)>;
-};
-
 &mx25r64 {
 	status = "okay";
 };

samples/matter/template/boards/nrf54l15dk_nrf54l15_cpuapp.overlay

@@ -4,6 +4,8 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
+#include <samples/matter/nrf54l15_cpuapp_partitions.dtsi>
+
 / {
 	aliases {
 		/* Use watchdog wdt31 as the application watchdog */
@@ -15,16 +17,6 @@
 	};
 };
 
-/* restore full RRAM and SRAM space - by default some parts are dedicated to FLRP */
-&cpuapp_rram {
-	reg = <0x0 DT_SIZE_K(1524)>;
-};
-
-&cpuapp_sram {
-	reg = <0x20000000 DT_SIZE_K(256)>;
-	ranges = <0x0 0x20000000 0x40000>;
-};
-
 &mx25r64 {
 	status = "okay";
 };

samples/matter/template/boards/nrf54l15dk_nrf54l15_cpuapp_internal.overlay

@@ -4,27 +4,15 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
+#include <samples/matter/nrf54l15_cpuapp_internal_partitions.dtsi>
+
 / {
 	aliases {
 		/* Use watchdog wdt31 as the application watchdog */
 		watchdog0 = &wdt31;
 	};
 };
 
-/* restore full RRAM and SRAM space - by default some parts are dedicated to FLRP */
-&cpuapp_rram {
-	reg = <0x0 DT_SIZE_K(1524)>;
-};
-
-&cpuapp_sram {
-	reg = <0x20000000 DT_SIZE_K(256)>;
-	ranges = <0x0 0x20000000 0x40000>;
-};
-
-&mx25r64 {
-	status = "disabled";
-};
-
 &wdt31 {
 	status = "okay";
 };

samples/matter/template/boards/nrf54l15dk_nrf54l15_cpuapp_ns.overlay

@@ -4,6 +4,8 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
+#include <samples/matter/nrf54l15_cpuapp_ns_partitions.dtsi>
+
 / {
 	aliases {
 		/* Use watchdog wdt31 as the application watchdog */
@@ -15,16 +17,6 @@
 	};
 };
 
-/* restore full RRAM and SRAM space - by default some parts are dedicated to FLRP */
-&cpuapp_rram {
-	reg = <0x0 DT_SIZE_K(1524)>;
-};
-
-&cpuapp_sram {
-	reg = <0x20000000 DT_SIZE_K(256)>;
-	ranges = <0x0 0x20000000 0x40000>;
-};
-
 &mx25r64 {
 	status = "okay";
 };

samples/matter/template/boards/nrf54l15tag_nrf54l15_cpuapp.overlay

@@ -4,23 +4,15 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
+#include <samples/matter/nrf54l15_cpuapp_internal_partitions.dtsi>
+
 / {
 	aliases {
 		/* Use watchdog wdt31 as the application watchdog */
 		watchdog0 = &wdt31;
 	};
 };
 
-/* restore full RRAM and SRAM space - by default some parts are dedicated to FLRP */
-&cpuapp_rram {
-	reg = <0x0 DT_SIZE_K(1524)>;
-};
-
-&cpuapp_sram {
-	reg = <0x20000000 DT_SIZE_K(256)>;
-	ranges = <0x0 0x20000000 0x40000>;
-};
-
 &wdt31 {
 	status = "okay";
 };

samples/matter/template/boards/nrf54lm20dk_nrf54lm20a_cpuapp.overlay

@@ -4,21 +4,16 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-/ {
-	chosen {
-		nordic,pm-ext-flash = &mx25r64;
-	};
+#include <samples/matter/nrf54lm20_cpuapp_partitions.dtsi>
 
+/ {
 	aliases {
 		/* Use watchdog wdt31 as the application watchdog */
 		watchdog0 = &wdt31;
 	};
-};
 
-&rram_controller {
-	cpuapp_rram: rram@0 {
-		reg = <0x0 DT_SIZE_K(2036)>;
-		ranges = <0x0 0x0 DT_SIZE_K(2036)>;
+	chosen {
+		nordic,pm-ext-flash = &mx25r64;
 	};
 };
 

samples/matter/template/boards/nrf54lm20dk_nrf54lm20a_cpuapp_internal.overlay

@@ -4,24 +4,15 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
+#include <samples/matter/nrf54lm20_cpuapp_internal_partitions.dtsi>
+
 / {
 	aliases {
 		/* Use watchdog wdt31 as the application watchdog */
 		watchdog0 = &wdt31;
 	};
 };
 
-&rram_controller {
-	cpuapp_rram: rram@0 {
-		reg = <0x0 DT_SIZE_K(2036)>;
-		ranges = <0x0 0x0 DT_SIZE_K(2036)>;
-	};
-};
-
-&mx25r64 {
-	status = "disabled";
-};
-
 &wdt31 {
 	status = "okay";
 };