dts: vendor: nordic: nrf5340: Fix SRAM partitioning

nordicjm · cfriedt · commit dd5a3f1a3e47 · 2025-10-27T16:26:24.000-04:00
Uses the correct way to partition memory as per the linux binding,
also fixes names which were not compliant with the zephyr
devicetree guidelines

Signed-off-by: Jamie McCrae &lt;jamie.mccrae@nordicsemi.no&gt;
diff --git a/boards/native/nrf_bsim/nrf5340bsim_nrf5340_cpuapp.dts b/boards/native/nrf_bsim/nrf5340bsim_nrf5340_cpuapp.dts
@@ -16,7 +16,6 @@
 
 	/* We need to remove aliases to nodes we delete */
 	aliases {
-		/delete-property/ sram-0;
 		/delete-property/ i2c-0;
 		/delete-property/ spi-0;
 		/delete-property/ i2c-1;
@@ -48,8 +47,6 @@
 	};
 
 	soc {
-		/delete-node/ memory@20000000;
-
 		peripheral@50000000 {
 			/delete-node/ dcnf@0;
 			/delete-node/ oscillator@4000;
@@ -110,6 +107,11 @@
 	};
 };
 
+&sram0 {
+	reg = <0x20000000 DT_SIZE_K(512)>;
+	ranges = <0x0 0x20000000 DT_SIZE_K(512)>;
+};
+
 &gpiote {
 	status = "okay";
 };
diff --git a/boards/native/nrf_bsim/nrf5340bsim_nrf5340_cpunet.dts b/boards/native/nrf_bsim/nrf5340bsim_nrf5340_cpunet.dts
@@ -16,7 +16,6 @@
 
 	/* We need to remove aliases to nodes we delete */
 	aliases {
-		/delete-property/ sram-0;
 		/delete-property/ sram-1;
 		/delete-property/ wdt-0;
 		/delete-property/ i2c-0;
@@ -33,7 +32,6 @@
 	};
 
 	soc {
-		/delete-node/ memory@20000000;
 		/delete-node/ memory@21000000;
 		/delete-node/ watchdog@4100b000;
 		/delete-node/ i2c@41013000;
@@ -70,6 +68,11 @@
 	};
 };
 
+&sram0 {
+	reg = <0x20000000 DT_SIZE_K(512)>;
+	ranges = <0x0 0x20000000 DT_SIZE_K(512)>;
+};
+
 &gpiote {
 	status = "okay";
 };
diff --git a/dts/vendor/nordic/nrf5340_shared_sram_partition.dtsi b/dts/vendor/nordic/nrf5340_shared_sram_partition.dtsi
@@ -21,15 +21,11 @@
 	chosen {
 		zephyr,ipc_shm = &sram0_shared;
 	};
+};
 
-	reserved-memory {
-		#address-cells = <1>;
-		#size-cells = <1>;
-		ranges;
-
-		sram0_shared: memory@20070000 {
-			/* Last 64 kB of sram0 */
-			reg = <0x20070000 0x10000>;
-		};
+&sram0 {
+	sram0_shared: sram@70000 {
+		/* Last 64 kB of sram0 */
+		reg = <0x70000 0x10000>;
 	};
 };
diff --git a/dts/vendor/nordic/nrf5340_sram_partition.dtsi b/dts/vendor/nordic/nrf5340_sram_partition.dtsi
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-/ {
+&sram0 {
 	/* Default SRAM planning when building for nRF5340 with ARM TF-M support
 	 * - Lowest 256 kB SRAM allocated to Secure image (sram0_s)
 	 * - Upper 256 kB allocated to Non-Secure image (sram0_ns)
@@ -13,29 +13,26 @@
 	 * - 64 kB allocated to shared memory (sram0_shared).
 	 *   (See nrf5340_shared_sram_partition.dtsi)
 	 */
-	reserved-memory {
-		#address-cells = <1>;
-		#size-cells = <1>;
-		ranges;
-
-		sram0_image: image@20000000 {
-			/* Zephyr image(s) memory */
-			reg = <0x20000000 DT_SIZE_K(448)>;
-		};
+	sram0_image: sram@0 {
+		/* Zephyr image(s) memory */
+		reg = <0x20000000 DT_SIZE_K(448)>;
+	};
 
-		sram0_s: image_s@20000000 {
-			/* Secure image memory */
-			reg = <0x20000000 0x40000>;
-		};
+	sram0_s: sram@20000000 {
+		/* Secure image memory */
+		reg = <0x20000000 0x40000>;
+	};
 
-		sram0_ns: image_ns@20040000 {
-			/* Non-Secure image memory */
-			reg = <0x20040000 0x40000>;
-		};
+	sram0_ns: sram@20040000 {
+		/* Non-Secure image memory */
+		reg = <0x20040000 0x40000>;
+		ranges = <0x0 0x20040000 0x40000>;
+		#address-cells = <1>;
+		#size-cells = <1>;
 
-		sram0_ns_app: image_ns_app@20040000 {
+		sram0_ns_app: sram@0 {
 			/* Non-Secure image memory */
-			reg = <0x20040000 0x30000>;
+			reg = <0x0 0x30000>;
 		};
 	};
 };
diff --git a/samples/subsys/ipc/ipc_service/icmsg/boards/nrf5340dk_nrf5340_cpuapp.overlay b/samples/subsys/ipc/ipc_service/icmsg/boards/nrf5340dk_nrf5340_cpuapp.overlay
@@ -4,13 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+/delete-node/ &sram0_shared;
+
 / {
 	chosen {
 		/delete-property/ zephyr,ipc_shm;
 	};
 
 	reserved-memory {
-		/delete-node/ memory@20070000;
+		#address-cells = <1>;
+		#size-cells = <1>;
 
 		sram_tx: memory@20070000 {
 			reg = <0x20070000 0x0800>;
diff --git a/samples/subsys/ipc/ipc_service/icmsg/remote/boards/nrf5340dk_nrf5340_cpunet.overlay b/samples/subsys/ipc/ipc_service/icmsg/remote/boards/nrf5340dk_nrf5340_cpunet.overlay
@@ -4,13 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+/delete-node/ &sram0_shared;
+
 / {
 	chosen {
 		/delete-property/ zephyr,ipc_shm;
 	};
 
 	reserved-memory {
-		/delete-node/ memory@20070000;
+		#address-cells = <1>;
+		#size-cells = <1>;
 
 		sram_rx: memory@20070000 {
 			reg = <0x20070000 0x0800>;
diff --git a/samples/subsys/ipc/ipc_service/multi_endpoint/boards/nrf5340dk_nrf5340_cpuapp.overlay b/samples/subsys/ipc/ipc_service/multi_endpoint/boards/nrf5340dk_nrf5340_cpuapp.overlay
@@ -4,13 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+/delete-node/ &sram0_shared;
+
 / {
 	chosen {
 		/delete-property/ zephyr,ipc_shm;
 	};
 
 	reserved-memory {
-		/delete-node/ memory@20070000;
+		#address-cells = <1>;
+		#size-cells = <1>;
 
 		sram_ipc0_tx: memory@20070000 {
 			reg = <0x20070000 0x4000>;
diff --git a/samples/subsys/ipc/ipc_service/multi_endpoint/boards/nrf5340dk_nrf5340_cpuapp_icbmsg.overlay b/samples/subsys/ipc/ipc_service/multi_endpoint/boards/nrf5340dk_nrf5340_cpuapp_icbmsg.overlay
@@ -4,13 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+/delete-node/ &sram0_shared;
+
 / {
 	chosen {
 		/delete-property/ zephyr,ipc_shm;
 	};
 
 	reserved-memory {
-		/delete-node/ memory@20070000;
+		#address-cells = <1>;
+		#size-cells = <1>;
 
 		sram_ipc0_tx: memory@20070000 {
 			reg = <0x20070000 0x4000>;
diff --git a/samples/subsys/ipc/ipc_service/multi_endpoint/remote/boards/nrf5340dk_nrf5340_cpunet.overlay b/samples/subsys/ipc/ipc_service/multi_endpoint/remote/boards/nrf5340dk_nrf5340_cpunet.overlay
@@ -4,13 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+/delete-node/ &sram0_shared;
+
 / {
 	chosen {
 		/delete-property/ zephyr,ipc_shm;
 	};
 
 	reserved-memory {
-		/delete-node/ memory@20070000;
+		#address-cells = <1>;
+		#size-cells = <1>;
 
 		sram_ipc0_rx: memory@20070000 {
 			reg = <0x20070000 0x4000>;
diff --git a/samples/subsys/ipc/ipc_service/multi_endpoint/remote/boards/nrf5340dk_nrf5340_cpunet_icbmsg.overlay b/samples/subsys/ipc/ipc_service/multi_endpoint/remote/boards/nrf5340dk_nrf5340_cpunet_icbmsg.overlay
@@ -4,13 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+/delete-node/ &sram0_shared;
+
 / {
 	chosen {
 		/delete-property/ zephyr,ipc_shm;
 	};
 
 	reserved-memory {
-		/delete-node/ memory@20070000;
+		#address-cells = <1>;
+		#size-cells = <1>;
 
 		sram_ipc0_rx: memory@20070000 {
 			reg = <0x20070000 0x4000>;
diff --git a/samples/subsys/ipc/ipc_service/static_vrings/boards/nrf5340dk_nrf5340_cpuapp.overlay b/samples/subsys/ipc/ipc_service/static_vrings/boards/nrf5340dk_nrf5340_cpuapp.overlay
@@ -6,13 +6,16 @@
 
 #include <zephyr/dt-bindings/ipc_service/static_vrings.h>
 
+/delete-node/ &sram0_shared;
+
 / {
 	chosen {
 		/delete-property/ zephyr,ipc_shm;
 	};
 
 	reserved-memory {
-		/delete-node/ memory@20070000;
+		#address-cells = <1>;
+		#size-cells = <1>;
 
 		sram_ipc0: memory@20070000 {
 			reg = <0x20070000 0x8000>;
diff --git a/samples/subsys/ipc/ipc_service/static_vrings/remote/boards/nrf5340dk_nrf5340_cpunet.overlay b/samples/subsys/ipc/ipc_service/static_vrings/remote/boards/nrf5340dk_nrf5340_cpunet.overlay
@@ -6,13 +6,16 @@
 
 #include <zephyr/dt-bindings/ipc_service/static_vrings.h>
 
+/delete-node/ &sram0_shared;
+
 / {
 	chosen {
 		/delete-property/ zephyr,ipc_shm;
 	};
 
 	reserved-memory {
-		/delete-node/ memory@20070000;
+		#address-cells = <1>;
+		#size-cells = <1>;
 
 		sram_ipc0: memory@20070000 {
 			reg = <0x20070000 0x8000>;
diff --git a/samples/subsys/logging/multidomain/boards/nrf5340dk_nrf5340_cpuapp.overlay b/samples/subsys/logging/multidomain/boards/nrf5340dk_nrf5340_cpuapp.overlay
@@ -6,14 +6,17 @@
 
 #include <zephyr/dt-bindings/ipc_service/static_vrings.h>
 
+/delete-node/ &sram0_shared;
+
 / {
 	chosen {
 		/delete-property/ zephyr,ipc_shm;
 		zephyr,log-ipc = &ipc0;
 	};
 
 	reserved-memory {
-		/delete-node/ memory@20070000;
+		#address-cells = <1>;
+		#size-cells = <1>;
 
 		sram_ipc0: memory@20070000 {
 			reg = <0x20070000 0x8000>;
diff --git a/samples/subsys/logging/multidomain/remote/boards/nrf5340dk_nrf5340_cpunet.overlay b/samples/subsys/logging/multidomain/remote/boards/nrf5340dk_nrf5340_cpunet.overlay
@@ -6,14 +6,17 @@
 
 #include <zephyr/dt-bindings/ipc_service/static_vrings.h>
 
+/delete-node/ &sram0_shared;
+
 / {
 	chosen {
 		/delete-property/ zephyr,ipc_shm;
 		zephyr,log-ipc = &ipc0;
 	};
 
 	reserved-memory {
-		/delete-node/ memory@20070000;
+		#address-cells = <1>;
+		#size-cells = <1>;
 
 		sram_ipc0: memory@20070000 {
 			reg = <0x20070000 0x8000>;
diff --git a/tests/subsys/ipc/ipc_sessions/boards/nrf5340dk_nrf5340_cpuapp.overlay b/tests/subsys/ipc/ipc_sessions/boards/nrf5340dk_nrf5340_cpuapp.overlay
@@ -5,6 +5,7 @@
  */
 
 /delete-node/ &ipc0;
+/delete-node/ &sram0_shared;
 
 / {
 	chosen {
@@ -13,7 +14,8 @@
 	};
 
 	reserved-memory {
-		/delete-node/ memory@20070000;
+		#address-cells = <1>;
+		#size-cells = <1>;
 
 		sram_tx: memory@20070000 {
 			reg = <0x20070000 0x8000>;
diff --git a/tests/subsys/ipc/ipc_sessions/remote/boards/nrf5340dk_nrf5340_cpunet.overlay b/tests/subsys/ipc/ipc_sessions/remote/boards/nrf5340dk_nrf5340_cpunet.overlay
@@ -5,14 +5,16 @@
  */
 
 /delete-node/ &ipc0;
+/delete-node/ &sram0_shared;
 
 / {
 	chosen {
 		/delete-property/ zephyr,ipc_shm;
 	};
 
 	reserved-memory {
-		/delete-node/ memory@20070000;
+		#address-cells = <1>;
+		#size-cells = <1>;
 
 		sram_rx: memory@20070000 {
 			reg = <0x20070000 0x8000>;
