boards: nordic: nrf54h20dk: Remove etr_buffer

Move the etr_buffer definition into an overlay so the region is unallocated by default. Signed-off-by: Karsten Koenig <[email protected]>
zephyrproject-rtos · Nov 14, 2024 · 35c9815 · 35c9815
1 parent 9d06a3a
commit 35c9815
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 19 deletions.
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi
@@ -47,21 +47,6 @@
 			};
 		};
 
-		etr_buf_ram0x_region: memory@2f0be000 {
-			compatible = "nordic,owned-memory";
-			reg = <0x2f0be000 DT_SIZE_K(4)>;
-			status = "disabled";
-			nordic,access = <NRF_OWNER_ID_APPLICATION NRF_PERM_RWS>;
-			#address-cells = <1>;
-			#size-cells = <1>;
-			ranges = <0x0 0x2f0be000 0x1000>;
-
-			/* TODO In future move this region to cpuapp_ram0x_region. */
-			etr_buffer: memory@0 {
-				reg = <0x0 DT_SIZE_K(4)>;
-			};
-		};
-
 		cpuapp_cpurad_ram0x_region: memory@2f0bf000 {
 			compatible = "nordic,owned-memory";
 			reg = <0x2f0bf000 DT_SIZE_K(4)>;

diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts
@@ -112,10 +112,6 @@
 	status = "okay";
 };
 
-&etr_buf_ram0x_region {
-	status = "okay";
-};
-
 &ram21_region {
 	status = "okay";
 };

diff --git a/snippets/nordic-log-stm-dict/boards/nrf54h20_cpuapp.overlay b/snippets/nordic-log-stm-dict/boards/nrf54h20_cpuapp.overlay
@@ -3,6 +3,24 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+ / {
+	reserved-memory {
+		etr_buf_ram0x_region: memory@2f0be000 {
+			compatible = "nordic,owned-memory";
+			reg = <0x2f0be000 DT_SIZE_K(4)>;
+			status = "okay";
+			nordic,access = <NRF_OWNER_ID_APPLICATION NRF_PERM_RWS>;
+			#address-cells = <1>;
+			#size-cells = <1>;
+			ranges = <0x0 0x2f0be000 0x1000>;
+
+			etr_buffer: memory@0 {
+				reg = <0x0 DT_SIZE_K(4)>;
+			};
+		};
+	};
+};
+
 &tbm {
 	status = "okay";
 };

diff --git a/snippets/nordic-log-stm/boards/nrf54h20_cpuapp.overlay b/snippets/nordic-log-stm/boards/nrf54h20_cpuapp.overlay
@@ -3,6 +3,25 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+ / {
+	reserved-memory {
+		etr_buf_ram0x_region: memory@2f0be000 {
+			compatible = "nordic,owned-memory";
+			reg = <0x2f0be000 DT_SIZE_K(4)>;
+			status = "okay";
+			nordic,access = <NRF_OWNER_ID_APPLICATION NRF_PERM_RWS>;
+			#address-cells = <1>;
+			#size-cells = <1>;
+			ranges = <0x0 0x2f0be000 0x1000>;
+
+			etr_buffer: memory@0 {
+				reg = <0x0 DT_SIZE_K(4)>;
+			};
+		};
+	};
+};
+
+
 &tbm {
 	status = "okay";
 };