Skip to content

Commit 807903e

Browse files
nordicjmeivindj-nordic
authored andcommitted
boards: nordic: bm_nrf54l15dk: Fix reserved memory location
Moves these to the root node instead of being under the soc node Signed-off-by: Jamie McCrae <[email protected]>
1 parent 0332328 commit 807903e

File tree

3 files changed

+36
-42
lines changed

3 files changed

+36
-42
lines changed

boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l05_cpuapp_common.dtsi

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -21,20 +21,6 @@
2121
};
2222

2323
soc {
24-
reserved-memory@20000000 {
25-
#address-cells = <1>;
26-
#size-cells = <1>;
27-
reg = <0x20000000 0x80>;
28-
ranges;
29-
30-
nrf_kmu_reserved_push_area: memory@20000000 {
31-
compatible = "zephyr,memory-region", "mmio-sram";
32-
reg = <0x20000000 0x80>;
33-
zephyr,memory-region = "nrf_kmu_reserved_push_area";
34-
status = "okay";
35-
};
36-
};
37-
3824
cpuapp_sram: memory@20000080 {
3925
compatible = "mmio-sram";
4026
#address-cells = <1>;
@@ -43,6 +29,18 @@
4329
ranges = <0x0 0x20000080 (DT_SIZE_K(96) - 0x80)>;
4430
};
4531
};
32+
33+
reserved-memory {
34+
#address-cells = <1>;
35+
#size-cells = <1>;
36+
ranges;
37+
38+
nrf_kmu_reserved_push_area: memory@20000000 {
39+
compatible = "zephyr,memory-region", "mmio-sram";
40+
reg = <0x20000000 0x80>;
41+
zephyr,memory-region = "nrf_kmu_reserved_push_area";
42+
};
43+
};
4644
};
4745

4846
/* Override NCS default to use entire RRAM for application CPU. */

boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l10_cpuapp_common.dtsi

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -21,20 +21,6 @@
2121
};
2222

2323
soc {
24-
reserved-memory@20000000 {
25-
#address-cells = <1>;
26-
#size-cells = <1>;
27-
reg = <0x20000000 0x80>;
28-
ranges;
29-
30-
nrf_kmu_reserved_push_area: memory@20000000 {
31-
compatible = "zephyr,memory-region", "mmio-sram";
32-
reg = <0x20000000 0x80>;
33-
zephyr,memory-region = "nrf_kmu_reserved_push_area";
34-
status = "okay";
35-
};
36-
};
37-
3824
cpuapp_sram: memory@20000080 {
3925
compatible = "mmio-sram";
4026
#address-cells = <1>;
@@ -43,6 +29,18 @@
4329
ranges = <0x0 0x20000080 (DT_SIZE_K(192) - 0x80)>;
4430
};
4531
};
32+
33+
reserved-memory {
34+
#address-cells = <1>;
35+
#size-cells = <1>;
36+
ranges;
37+
38+
nrf_kmu_reserved_push_area: memory@20000000 {
39+
compatible = "zephyr,memory-region", "mmio-sram";
40+
reg = <0x20000000 0x80>;
41+
zephyr,memory-region = "nrf_kmu_reserved_push_area";
42+
};
43+
};
4644
};
4745

4846
/* Override NCS default to use entire RRAM for application CPU. */

boards/nordic/bm_nrf54l15dk/bm_nrf54l15dk_nrf54l15_cpuapp_common.dtsi

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -21,20 +21,6 @@
2121
};
2222

2323
soc {
24-
reserved-memory@20000000 {
25-
#address-cells = <1>;
26-
#size-cells = <1>;
27-
reg = <0x20000000 0x80>;
28-
ranges;
29-
30-
nrf_kmu_reserved_push_area: memory@20000000 {
31-
compatible = "zephyr,memory-region", "mmio-sram";
32-
reg = <0x20000000 0x80>;
33-
zephyr,memory-region = "nrf_kmu_reserved_push_area";
34-
status = "okay";
35-
};
36-
};
37-
3824
cpuapp_sram: memory@20000080 {
3925
compatible = "mmio-sram";
4026
#address-cells = <1>;
@@ -43,6 +29,18 @@
4329
ranges = <0x0 0x20000080 (DT_SIZE_K(256) - 0x80)>;
4430
};
4531
};
32+
33+
reserved-memory {
34+
#address-cells = <1>;
35+
#size-cells = <1>;
36+
ranges;
37+
38+
nrf_kmu_reserved_push_area: memory@20000000 {
39+
compatible = "zephyr,memory-region", "mmio-sram";
40+
reg = <0x20000000 0x80>;
41+
zephyr,memory-region = "nrf_kmu_reserved_push_area";
42+
};
43+
};
4644
};
4745

4846
/* Override NCS default to use entire RRAM for application CPU. */

0 commit comments

Comments
 (0)