From d65bafa34bc57f652800cf0f6e6402ff7dca0289 Mon Sep 17 00:00:00 2001 From: Christian Lamparter Date: Sat, 14 May 2022 10:44:58 +0200 Subject: apm821xx: use nested fixed-partitions This makes it possible to fix Netgear WNDAP620+660 DTS ugliness. Bring back the dtb and firmware partitions for the WNDR4700. Thank you, mans0n. Signed-off-by: Christian Lamparter --- target/linux/apm821xx/dts/netgear-wndr4700.dts | 39 +++++++++++++++++++------- 1 file changed, 29 insertions(+), 10 deletions(-) (limited to 'target/linux/apm821xx/dts/netgear-wndr4700.dts') diff --git a/target/linux/apm821xx/dts/netgear-wndr4700.dts b/target/linux/apm821xx/dts/netgear-wndr4700.dts index fe0f713943..342f9a01db 100644 --- a/target/linux/apm821xx/dts/netgear-wndr4700.dts +++ b/target/linux/apm821xx/dts/netgear-wndr4700.dts @@ -187,22 +187,41 @@ }; partition@180000 { - label = "kernel"; - reg = <0x00180000 0x00380000>; + label = "firmware"; + reg = <0x00180000 0x01860000>; + + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + partition@0 { + label = "kernel"; + reg = <0x00000000 0x00380000>; + + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + /* + * device-tree is @ 0x00180000 - 0x0019ffff + * kernel starts from 0x20000. + * this is coded into netgear's u-boot. + */ + partition@0 { + label = "dtb"; + reg = <0x00000000 0x20000>; + }; /* - * device-tree is @ 0x00180000 - 0x001fffff - * kernel starts from 0x200000. - * this is coded into netgear's u-boot. - * * this partition will also contain a * fake/empty rootfs at the end to fool * Netgear's uboot rootfs integrety checks. */ - }; + }; - partition@500000 { - label = "ubi"; - reg = <0x00500000 0x014e0000>; + partition@380000 { + label = "ubi"; + reg = <0x00380000 0x014e0000>; + }; }; -- cgit v1.2.3