Skip to content

[Backport v3.0-branch] NCSDK-32650: Revert incompatible memory changes #2737

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 10, 2025
Merged

[Backport v3.0-branch] NCSDK-32650: Revert incompatible memory changes #2737

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
35eace1
[nrf fromtree] Revert "boards: nordic: Fix cpuapp_ram0x_region reg va…
tomchy Mar 28, 2025
8d9815e
[nrf fromtree] Revert "boards: nordic: Rearrange ram0x regions."
tomchy Mar 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = <NRF_OWNER_ID_RADIOCORE NRF_PERM_RWS>;
nordic,access = <NRF_OWNER_ID_APPLICATION NRF_PERM_RWS>;
#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 = <0x2f011000 DT_SIZE_K(260)>;
reg = <0x2f051000 DT_SIZE_K(4)>;
status = "disabled";
nordic,access = <NRF_OWNER_ID_APPLICATION NRF_PERM_RWS>;
nordic,access = <NRF_OWNER_ID_RADIOCORE NRF_PERM_RWS>;
#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 {
Expand Down