boards: nordic: nrf54h20dk: Move etr region

Drop the standalone etr buffer memory region and move the etr buffer into the basic app core memory. Signed-off-by: Karsten Koenig <karsten.koenig@nordicsemi.no>
nrfconnect · Nov 4, 2024 · bdf9b12 · bdf9b12
1 parent ad0f474
commit bdf9b12
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 21 deletions.
diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi
@@ -24,8 +24,12 @@
 				reg = <0x800 DT_SIZE_K(2)>;
 			};
 
-			cpuapp_data: memory@1000 {
-				reg = <0x1000 DT_SIZE_K(256)>;
+			etr_buffer: memory@1000 {
+				reg = <0x1000 DT_SIZE_K(4)>;
+			};
+
+			cpuapp_data: memory@2000 {
+				reg = <0x2000 DT_SIZE_K(252)>;
 			};
 		};
 
@@ -47,21 +51,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
@@ -119,10 +119,6 @@
 	status = "okay";
 };
 
-&etr_buf_ram0x_region {
-	status = "okay";
-};
-
 &ram21_region {
 	status = "okay";
 };