From da17aca73e31fe9fb9e709550321a2ddf94a76d1 Mon Sep 17 00:00:00 2001
From: Alex Tsamakos <alex@actinius.com>
Date: Mon, 7 Sep 2020 17:11:56 +0200
Subject: [PATCH] boards: arm: actinius_icarus: update RAM partitions in DTS

Add chosen nodes for secure and non-secure RAM partitions
and update the common DTS to have a reserved-memory
node with all reserved RAM partitions

Signed-off-by: Alex Tsamakos <alex@actinius.com>
---
 .../arm/actinius_icarus/actinius_icarus.dts   |  4 +++-
 .../actinius_icarus_common.dts                | 23 +++++++++++++------
 .../actinius_icarus_partition_conf.dts        |  6 ++---
 3 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/boards/arm/actinius_icarus/actinius_icarus.dts b/boards/arm/actinius_icarus/actinius_icarus.dts
index 883f040c1e4..7566929aff7 100644
--- a/boards/arm/actinius_icarus/actinius_icarus.dts
+++ b/boards/arm/actinius_icarus/actinius_icarus.dts
@@ -10,8 +10,10 @@
 
 / {
 	chosen {
-		zephyr,sram = &sram0;
+		zephyr,sram = &sram0_s;
 		zephyr,flash = &flash0;
 		zephyr,code-partition = &slot0_partition;
+		zephyr,sram-secure-partition = &sram0_s;
+		zephyr,sram-non-secure-partition = &sram0_ns;
 	};
 };
diff --git a/boards/arm/actinius_icarus/actinius_icarus_common.dts b/boards/arm/actinius_icarus/actinius_icarus_common.dts
index 5fd3c5e2408..e4256f1f900 100644
--- a/boards/arm/actinius_icarus/actinius_icarus_common.dts
+++ b/boards/arm/actinius_icarus/actinius_icarus_common.dts
@@ -208,14 +208,23 @@
 };
 
 / {
-	/* SRAM allocated and used by the BSD library */
-	sram0_bsd: memory@20010000 {
-		compatible = "mmio-sram";
-	};
 
-	/* SRAM allocated to the Non-Secure image */
-	sram0_ns: memory@20020000 {
-		compatible = "mmio-sram";
+	reserved-memory {
+		#address-cells = <1>;
+		#size-cells = <1>;
+		ranges;
+
+		sram0_s: image_s@20000000 {
+			/* Secure image memory */
+		};
+
+		sram0_bsd: image_bsd@20010000 {
+			/* BSD (shared) memory */
+		};
+
+		sram0_ns: image_ns@20020000 {
+			/* Non-Secure image memory */
+		};
 	};
 };
 
diff --git a/boards/arm/actinius_icarus/actinius_icarus_partition_conf.dts b/boards/arm/actinius_icarus/actinius_icarus_partition_conf.dts
index f121f603f77..0535d393efc 100644
--- a/boards/arm/actinius_icarus/actinius_icarus_partition_conf.dts
+++ b/boards/arm/actinius_icarus/actinius_icarus_partition_conf.dts
@@ -39,13 +39,13 @@
 
 /* Default SRAM planning when building for nRF9160 with
  * ARM TrustZone-M support
- * - Lowest 64 kB SRAM allocated to Secure image (sram0).
+ * - Lowest 64 kB SRAM allocated to Secure image (sram0_s).
  * - 64 kB SRAM reserved for and used by the BSD socket
- *   library.
+ *   library (sram0_bsd).
  * - Upper 128 kB allocated to Non-Secure image (sram0_ns).
  */
 
-&sram0 {
+&sram0_s {
 	reg = <0x20000000 DT_SIZE_K(64)>;
 };