[nrf fromlist] dts: vendor: nordic: nrf54l10: Fix wrong size of NVM

boards/ezurio/bl54l15_dvk/bl54l15_dvk_nrf54l10_cpuapp.dts

@@ -26,49 +26,5 @@
 	ranges = <0x0 0x20000000 DT_SIZE_K(192)>;
 };
 
-&cpuapp_rram {
-	reg = <0x0 DT_SIZE_K(1022)>;
-};
-
-/* These partition sizes assume no FLPR area in RRAM */
-&cpuapp_rram {
-	partitions {
-		compatible = "fixed-partitions";
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		boot_partition: partition@0 {
-			label = "mcuboot";
-			reg = <0x0 DT_SIZE_K(64)>;
-		};
-
-		slot0_partition: partition@10000 {
-			label = "image-0";
-			reg = <0x10000 DT_SIZE_K(224)>;
-		};
-
-		slot0_ns_partition: partition@48000 {
-			label = "image-0-nonsecure";
-			reg = <0x48000 DT_SIZE_K(224)>;
-		};
-
-		slot1_partition: partition@80000 {
-			label = "image-1";
-			reg = <0x80000 DT_SIZE_K(224)>;
-		};
-
-		slot1_ns_partition: partition@b8000 {
-			label = "image-1-nonsecure";
-			reg = <0xb8000 DT_SIZE_K(224)>;
-		};
-
-		/* 32K from 0xf0000 to 0xf7fff reserved for TF-M partitions */
-
-		storage_partition: partition@f8000 {
-			label = "storage";
-			reg = <0xf8000 DT_SIZE_K(28)>;
-		};
-
-		/* 2K from 0xff000 to 0xff7ff unused */
-	};
-};
+/* Include default memory partition configuration file */
+#include <nordic/nrf54l10_partition.dtsi>

boards/ezurio/bl54l15_dvk/bl54l15_dvk_nrf54l10_cpuapp.yaml

@@ -11,7 +11,7 @@ toolchain:
   - zephyr
 sysbuild: true
 ram: 192
-flash: 230
+flash: 1012
 supported:
   - adc
   - counter

boards/ezurio/bl54l15_dvk/bl54l15_dvk_nrf54l10_cpuapp_ns.dts

@@ -59,6 +59,9 @@
 };
 
 &cpuapp_rram {
+	/* TODO: revert this hack when TF-M update is available that fixes partition sizes */
+	reg = <0x0 DT_SIZE_K(1022)>;
+
 	partitions {
 		compatible = "fixed-partitions";
 		#address-cells = <1>;

boards/ezurio/bl54l15_dvk/bl54l15_dvk_nrf54l15_cpuapp.dts

@@ -20,41 +20,5 @@
 	};
 };
 
-&cpuapp_rram {
-	partitions {
-		compatible = "fixed-partitions";
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		boot_partition: partition@0 {
-			label = "mcuboot";
-			reg = <0x0 DT_SIZE_K(64)>;
-		};
-
-		slot0_partition: partition@10000 {
-			label = "image-0";
-			reg = <0x10000 DT_SIZE_K(324)>;
-		};
-
-		slot0_ns_partition: partition@61000 {
-			label = "image-0-nonsecure";
-			reg = <0x61000 DT_SIZE_K(324)>;
-		};
-
-		slot1_partition: partition@b2000 {
-			label = "image-1";
-			reg = <0xb2000 DT_SIZE_K(324)>;
-		};
-
-		slot1_ns_partition: partition@103000 {
-			label = "image-1-nonsecure";
-			reg = <0x103000 DT_SIZE_K(324)>;
-		};
-
-		/* 32k from 0x154000 to 0x15bfff reserved for TF-M partitions */
-		storage_partition: partition@15c000 {
-			label = "storage";
-			reg = <0x15c000 DT_SIZE_K(36)>;
-		};
-	};
-};
+/* Include default memory partition configuration file */
+#include <nordic/nrf54l15_partition.dtsi>

boards/ezurio/bl54l15_dvk/bl54l15_dvk_nrf54l15_cpuapp.yaml

@@ -11,7 +11,7 @@ toolchain:
   - zephyr
 sysbuild: true
 ram: 188
-flash: 324
+flash: 1428
 supported:
   - adc
   - counter

boards/ezurio/bl54l15_dvk/bl54l15_dvk_nrf54l15_cpuapp_ns.dts

@@ -58,51 +58,6 @@
 	};
 };
 
-&cpuapp_rram {
-	partitions {
-		compatible = "fixed-partitions";
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		/* nRF54L15 has 1524 kB of non volatile memory (RRAM) but the
-		 * last 96kB are reserved for the FLPR MCU.
-		 *
-		 * This static layout needs to be the same with the upstream TF-M layout in the
-		 * header flash_layout.h of the relevant platform. Any updates in the layout
-		 * needs to happen both in the flash_layout.h and in this file at the same time.
-		 */
-		slot0_partition: partition@0 {
-			label = "image-0";
-			reg = <0x0000000 DT_SIZE_K(512)>;
-		};
-
-		tfm_ps_partition: partition@80000 {
-			label = "tfm-ps";
-			reg = <0x00080000 DT_SIZE_K(16)>;
-		};
-
-		tfm_its_partition: partition@84000 {
-			label = "tfm-its";
-			reg = <0x00084000 DT_SIZE_K(16)>;
-		};
-
-		tfm_otp_partition: partition@88000 {
-			label = "tfm-otp";
-			reg = <0x00088000 DT_SIZE_K(8)>;
-		};
-
-		slot0_ns_partition: partition@8A000 {
-			label = "image-0-nonsecure";
-			reg = <0x0008A000 DT_SIZE_K(844)>;
-		};
-
-		storage_partition: partition@15D000 {
-			label = "storage";
-			reg = <0x00015D000 DT_SIZE_K(32)>;
-		};
-	};
-};
-
 &uart30 {
 	/* Disable so that TF-M can use this UART */
 	status = "disabled";
@@ -112,3 +67,6 @@
 	pinctrl-1 = <&uart30_sleep>;
 	pinctrl-names = "default", "sleep";
 };
+
+/* Include default memory partition configuration file */
+#include <nordic/nrf54l15_ns_partition.dtsi>

boards/ezurio/bl54l15u_dvk/bl54l15u_dvk_nrf54l15_cpuapp.dts

@@ -20,41 +20,5 @@
 	};
 };
 
-&cpuapp_rram {
-	partitions {
-		compatible = "fixed-partitions";
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		boot_partition: partition@0 {
-			label = "mcuboot";
-			reg = <0x0 DT_SIZE_K(64)>;
-		};
-
-		slot0_partition: partition@10000 {
-			label = "image-0";
-			reg = <0x10000 DT_SIZE_K(324)>;
-		};
-
-		slot0_ns_partition: partition@61000 {
-			label = "image-0-nonsecure";
-			reg = <0x61000 DT_SIZE_K(324)>;
-		};
-
-		slot1_partition: partition@b2000 {
-			label = "image-1";
-			reg = <0xb2000 DT_SIZE_K(324)>;
-		};
-
-		slot1_ns_partition: partition@103000 {
-			label = "image-1-nonsecure";
-			reg = <0x103000 DT_SIZE_K(324)>;
-		};
-
-		/* 32k from 0x154000 to 0x15bfff reserved for TF-M partitions */
-		storage_partition: partition@15c000 {
-			label = "storage";
-			reg = <0x15c000 DT_SIZE_K(36)>;
-		};
-	};
-};
+/* Include default memory partition configuration file */
+#include <nordic/nrf54l15_partition.dtsi>

boards/ezurio/bl54l15u_dvk/bl54l15u_dvk_nrf54l15_cpuapp.yaml

@@ -11,7 +11,7 @@ toolchain:
   - zephyr
 sysbuild: true
 ram: 188
-flash: 324
+flash: 1428
 supported:
   - adc
   - counter

boards/ezurio/bl54l15u_dvk/bl54l15u_dvk_nrf54l15_cpuapp_ns.dts

@@ -58,51 +58,6 @@
 	};
 };
 
-&cpuapp_rram {
-	partitions {
-		compatible = "fixed-partitions";
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		/* nRF54L15 has 1524 kB of non volatile memory (RRAM) but the
-		 * last 96kB are reserved for the FLPR MCU.
-		 *
-		 * This static layout needs to be the same with the upstream TF-M layout in the
-		 * header flash_layout.h of the relevant platform. Any updates in the layout
-		 * needs to happen both in the flash_layout.h and in this file at the same time.
-		 */
-		slot0_partition: partition@0 {
-			label = "image-0";
-			reg = <0x0000000 DT_SIZE_K(512)>;
-		};
-
-		tfm_ps_partition: partition@80000 {
-			label = "tfm-ps";
-			reg = <0x00080000 DT_SIZE_K(16)>;
-		};
-
-		tfm_its_partition: partition@84000 {
-			label = "tfm-its";
-			reg = <0x00084000 DT_SIZE_K(16)>;
-		};
-
-		tfm_otp_partition: partition@88000 {
-			label = "tfm-otp";
-			reg = <0x00088000 DT_SIZE_K(8)>;
-		};
-
-		slot0_ns_partition: partition@8A000 {
-			label = "image-0-nonsecure";
-			reg = <0x0008A000 DT_SIZE_K(844)>;
-		};
-
-		storage_partition: partition@15D000 {
-			label = "storage";
-			reg = <0x00015D000 DT_SIZE_K(32)>;
-		};
-	};
-};
-
 &uart30 {
 	/* Disable so that TF-M can use this UART */
 	status = "disabled";
@@ -112,3 +67,6 @@
 	pinctrl-1 = <&uart30_sleep>;
 	pinctrl-names = "default", "sleep";
 };
+
+/* Include default memory partition configuration file */
+#include <nordic/nrf54l15_ns_partition.dtsi>

boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l05_cpuapp.dts

@@ -25,45 +25,5 @@
 	ranges = <0x0 0x20000000 DT_SIZE_K(96)>;
 };
 
-&cpuapp_rram {
-	reg = <0x0 DT_SIZE_K(500)>;
-};
-
-/* These partition sizes assume no FLPR area in RRAM */
-&cpuapp_rram {
-	partitions {
-		compatible = "fixed-partitions";
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		boot_partition: partition@0 {
-			label = "mcuboot";
-			reg = <0x0 DT_SIZE_K(64)>;
-		};
-
-		slot0_partition: partition@10000 {
-			label = "image-0";
-			reg = <0x10000 DT_SIZE_K(100)>;
-		};
-
-		slot0_ns_partition: partition@29000 {
-			label = "image-0-nonsecure";
-			reg = <0x29000 DT_SIZE_K(100)>;
-		};
-
-		slot1_partition: partition@42000 {
-			label = "image-1";
-			reg = <0x42000 DT_SIZE_K(100)>;
-		};
-
-		slot1_ns_partition: partition@5b000 {
-			label = "image-1-nonsecure";
-			reg = <0x5b000 DT_SIZE_K(100)>;
-		};
-
-		storage_partition: partition@74000 {
-			label = "storage";
-			reg = <0x74000 DT_SIZE_K(36)>;
-		};
-	};
-};
+/* Include default memory partition configuration file */
+#include <nordic/nrf54l05_partition.dtsi>

boards/nordic/nrf54l15dk/nrf54l15dk_nrf54l05_cpuapp.yaml

@@ -10,7 +10,7 @@ toolchain:
   - zephyr
 sysbuild: true
 ram: 96
-flash: 100
+flash: 500
 supported:
   - adc
   - counter