Skip to content

Commit 0dc5e18

Browse files
lucien-nxphenrikbrixandersen
authored andcommitted
dts: arm: nxp: fix build warning about memory address overlap
Change the start location of the parent node to avoid overlapping with the DTCM address. Signed-off-by: Lucien Zhao <[email protected]>
1 parent 751f3a9 commit 0dc5e18

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

dts/arm/nxp/nxp_rt118x.dtsi

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -957,16 +957,16 @@
957957
&memory {
958958
#address-cells = <1>;
959959
#size-cells = <1>;
960-
ocram1: ocram@484000 {
960+
ocram1: ocram@0 {
961961
compatible = "zephyr,memory-region", "mmio-sram";
962962
zephyr,memory-region = "OCRAM1";
963963
/* OCRAM1 first 16K access is blocked by TRDC */
964-
reg = <0x484000 DT_SIZE_K(496)>;
964+
reg = <0x0 DT_SIZE_K(496)>;
965965
};
966966

967-
ocram2: ocram@500000 {
967+
ocram2: ocram@7c000 {
968968
compatible = "zephyr,memory-region", "mmio-sram";
969969
zephyr,memory-region = "OCRAM2";
970-
reg = <0x500000 DT_SIZE_K(256)>;
970+
reg = <0x7c000 DT_SIZE_K(256)>;
971971
};
972972
};

dts/arm/nxp/nxp_rt118x_cm33.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
zephyr,memory-region = "DTCM";
2323
};
2424

25-
memory: memory@30000000 {
26-
ranges = <0x0 0x30000000 0x10000000>;
25+
memory: memory@30484000 {
26+
ranges = <0x0 0x30484000 0x10000000>;
2727
};
2828

2929
peripheral: peripheral@50000000 {

dts/arm/nxp/nxp_rt118x_cm33_ns.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
zephyr,memory-region = "DTCM";
2323
};
2424

25-
memory: memory@20000000 {
26-
ranges = <0x0 0x20000000 0x10000000>;
25+
memory: memory@20484000 {
26+
ranges = <0x0 0x20484000 0x10000000>;
2727
};
2828

2929
peripheral: peripheral@40000000 {

dts/arm/nxp/nxp_rt118x_cm7.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
reg = <0x20000000 DT_SIZE_K(256)>;
2020
};
2121

22-
memory: memory@20000000 {
23-
ranges = <0x0 0x20000000 0x10000000>;
22+
memory: memory@20484000 {
23+
ranges = <0x0 0x20484000 0x10000000>;
2424
};
2525

2626
peripheral: peripheral@40000000 {

0 commit comments

Comments
 (0)