Skip to content

Commit

Permalink
dts: arm: nxp: fix build warning about memory address overlap
Browse files Browse the repository at this point in the history
Change the start location of the parent node to avoid
overlapping with the DTCM address.

Signed-off-by: Lucien Zhao <[email protected]>
  • Loading branch information
lucien-nxp authored and henrikbrixandersen committed Jan 8, 2025
1 parent 751f3a9 commit 0dc5e18
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
8 changes: 4 additions & 4 deletions dts/arm/nxp/nxp_rt118x.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -957,16 +957,16 @@
&memory {
#address-cells = <1>;
#size-cells = <1>;
ocram1: ocram@484000 {
ocram1: ocram@0 {
compatible = "zephyr,memory-region", "mmio-sram";
zephyr,memory-region = "OCRAM1";
/* OCRAM1 first 16K access is blocked by TRDC */
reg = <0x484000 DT_SIZE_K(496)>;
reg = <0x0 DT_SIZE_K(496)>;
};

ocram2: ocram@500000 {
ocram2: ocram@7c000 {
compatible = "zephyr,memory-region", "mmio-sram";
zephyr,memory-region = "OCRAM2";
reg = <0x500000 DT_SIZE_K(256)>;
reg = <0x7c000 DT_SIZE_K(256)>;
};
};
4 changes: 2 additions & 2 deletions dts/arm/nxp/nxp_rt118x_cm33.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
zephyr,memory-region = "DTCM";
};

memory: memory@30000000 {
ranges = <0x0 0x30000000 0x10000000>;
memory: memory@30484000 {
ranges = <0x0 0x30484000 0x10000000>;
};

peripheral: peripheral@50000000 {
Expand Down
4 changes: 2 additions & 2 deletions dts/arm/nxp/nxp_rt118x_cm33_ns.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
zephyr,memory-region = "DTCM";
};

memory: memory@20000000 {
ranges = <0x0 0x20000000 0x10000000>;
memory: memory@20484000 {
ranges = <0x0 0x20484000 0x10000000>;
};

peripheral: peripheral@40000000 {
Expand Down
4 changes: 2 additions & 2 deletions dts/arm/nxp/nxp_rt118x_cm7.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
reg = <0x20000000 DT_SIZE_K(256)>;
};

memory: memory@20000000 {
ranges = <0x0 0x20000000 0x10000000>;
memory: memory@20484000 {
ranges = <0x0 0x20484000 0x10000000>;
};

peripheral: peripheral@40000000 {
Expand Down

0 comments on commit 0dc5e18

Please sign in to comment.