diff options
| author | Rosen Penev <rosenp@gmail.com> | 2023-12-01 14:32:23 -0800 |
|---|---|---|
| committer | Christian Marangi <ansuelsmth@gmail.com> | 2024-01-05 16:17:58 +0100 |
| commit | 2e6ec200dfe6ee62380821bc001d0b546bc6f799 (patch) | |
| tree | 81c9be5551db7c1a7d479b4fb3a84d2d6711b15a /target/linux | |
| parent | 506b4d563eb735b6e1597cb9c58f9eb02e1d0221 (diff) | |
| download | openwrt-2e6ec200dfe6ee62380821bc001d0b546bc6f799.tar.gz openwrt-2e6ec200dfe6ee62380821bc001d0b546bc6f799.tar.bz2 openwrt-2e6ec200dfe6ee62380821bc001d0b546bc6f799.zip | |
ath79: move kernel and ubi into subnodes
Avoids dtc warnings regarding two sections having the same numbers.
X: duplicate unit-address (also used in node Y)
Signed-off-by: Rosen Penev <rosenp@gmail.com>
Diffstat (limited to 'target/linux')
| -rw-r--r-- | target/linux/ath79/dts/ar9344_netgear_wndr.dtsi | 29 | ||||
| -rw-r--r-- | target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts | 20 |
2 files changed, 27 insertions, 22 deletions
diff --git a/target/linux/ath79/dts/ar9344_netgear_wndr.dtsi b/target/linux/ath79/dts/ar9344_netgear_wndr.dtsi index d2a3000004..49057548f8 100644 --- a/target/linux/ath79/dts/ar9344_netgear_wndr.dtsi +++ b/target/linux/ath79/dts/ar9344_netgear_wndr.dtsi @@ -90,7 +90,7 @@ #address-cells = <1>; #size-cells = <1>; - ubi@ac0000 { + ubi@0 { label = "ubi"; reg = <0x0 0x7500000>; }; @@ -171,22 +171,23 @@ reg = <0x3c0000 0x300000>; }; - kernel@6c0000 { - label = "kernel"; - reg = <0x6c0000 0x400000>; - }; - - ubiconcat0: partition@ac0000 { - label = "ubiconcat0"; - reg = <0xac0000 0x1500000>; - }; - partition@6c0000 { label = "firmware"; reg = <0x6c0000 0x1900000>; - compatible = "openwrt,uimage", "denx,uimage"; - openwrt,ih-magic = <0x33373033>; - openwrt,ih-type = <IH_TYPE_FILESYSTEM>; + + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + kernel@0 { + label = "kernel"; + reg = <0x0 0x400000>; + }; + + ubiconcat0: partition@400000 { + label = "ubiconcat0"; + reg = <0x400000 0x1500000>; + }; }; partition@1fc0000 { diff --git a/target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts b/target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts index 9aee8c362c..20230e684e 100644 --- a/target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts +++ b/target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts @@ -143,16 +143,20 @@ firmware@500000 { label = "firmware"; reg = <0x500000 0x7b00000>; - }; - partition@500000 { - label = "kernel"; - reg = <0x500000 0x400000>; - }; + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + partition@0 { + label = "kernel"; + reg = <0x0 0x400000>; + }; - partition@900000 { - label = "ubi"; - reg = <0x900000 0x7700000>; + partition@400000 { + label = "ubi"; + reg = <0x400000 0x7700000>; + }; }; }; }; |