From 35eace13fe7463b25b76440dd1b7b661f1df3e57 Mon Sep 17 00:00:00 2001 From: Tomasz Chyrowicz Date: Fri, 28 Mar 2025 10:42:13 +0100 Subject: [PATCH 1/2] [nrf fromtree] Revert "boards: nordic: Fix cpuapp_ram0x_region reg value." This reverts commit 1e69738bf2841a0f1451237bbb8d7a76d297f7b4. Ref: NCSDK-32650 Signed-off-by: Tomasz Chyrowicz This reverts commit 1e69738bf2841a0f1451237bbb8d7a76d297f7b4 (cherry picked from commit 062e6e19c028e524c952fec943028f35d8f40e87) --- boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi index 165fa12ba80..8dc6ef757e9 100644 --- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi +++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi @@ -27,7 +27,7 @@ cpuapp_ram0x_region: memory@2f011000 { compatible = "nordic,owned-memory"; - reg = <0x2f011000 DT_SIZE_K(260)>; + reg = <0x2f010000 DT_SIZE_K(260)>; status = "disabled"; nordic,access = ; #address-cells = <1>; From 8d9815ef15472a8ed43c30155919e0d77a9d1039 Mon Sep 17 00:00:00 2001 From: Tomasz Chyrowicz Date: Fri, 28 Mar 2025 10:42:46 +0100 Subject: [PATCH 2/2] [nrf fromtree] Revert "boards: nordic: Rearrange ram0x regions." This reverts commit a53cb7358717f21079197817976b938d37159c85. Ref: NCSDK-32650 Signed-off-by: Tomasz Chyrowicz This reverts commit a53cb7358717f21079197817976b938d37159c85. (cherry picked from commit db34319d012889c8eefa994a1b30188256cebc3c) --- .../nrf54h20dk_nrf54h20-memory_map.dtsi | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi index 8dc6ef757e9..f2937402554 100644 --- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi +++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi @@ -7,44 +7,44 @@ / { reserved-memory { - cpurad_ram0x_region: memory@2f010000 { + cpuapp_ram0x_region: memory@2f010000 { compatible = "nordic,owned-memory"; - reg = <0x2f010000 DT_SIZE_K(4)>; + reg = <0x2f010000 DT_SIZE_K(260)>; status = "disabled"; - nordic,access = ; + nordic,access = ; #address-cells = <1>; #size-cells = <1>; - ranges = <0x0 0x2f010000 0x1000>; + ranges = <0x0 0x2f010000 0x41000>; - cpusec_cpurad_ipc_shm: memory@0 { + cpusec_cpuapp_ipc_shm: memory@0 { reg = <0x0 DT_SIZE_K(2)>; }; - cpurad_cpusec_ipc_shm: memory@800 { + cpuapp_cpusec_ipc_shm: memory@800 { reg = <0x800 DT_SIZE_K(2)>; }; + + cpuapp_data: memory@1000 { + reg = <0x1000 DT_SIZE_K(256)>; + }; }; - cpuapp_ram0x_region: memory@2f011000 { + cpurad_ram0x_region: memory@2f051000 { compatible = "nordic,owned-memory"; - reg = <0x2f010000 DT_SIZE_K(260)>; + reg = <0x2f051000 DT_SIZE_K(4)>; status = "disabled"; - nordic,access = ; + nordic,access = ; #address-cells = <1>; #size-cells = <1>; - ranges = <0x0 0x2f011000 0x41000>; + ranges = <0x0 0x2f051000 0x1000>; - cpusec_cpuapp_ipc_shm: memory@0 { + cpusec_cpurad_ipc_shm: memory@0 { reg = <0x0 DT_SIZE_K(2)>; }; - cpuapp_cpusec_ipc_shm: memory@800 { + cpurad_cpusec_ipc_shm: memory@800 { reg = <0x800 DT_SIZE_K(2)>; }; - - cpuapp_data: memory@1000 { - reg = <0x1000 DT_SIZE_K(256)>; - }; }; etr_buf_ram0x_region: memory@2f0be000 {