From: Jonas Gorski Date: Wed, 28 Jun 2017 08:44:38 +0000 (+0200) Subject: brcm63xx: switch to new partition layout specification X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=a27d59bb427466311fe7e69da3f0f53be18237aa;p=openwrt%2Fstaging%2Fblogic.git brcm63xx: switch to new partition layout specification Now that we support parsing the expected upstream definition, update the dts files to it. Signed-off-by: Jonas Gorski --- diff --git a/target/linux/brcm63xx/dts/a226g.dts b/target/linux/brcm63xx/dts/a226g.dts index 921e46c79661..539f776af835 100644 --- a/target/linux/brcm63xx/dts/a226g.dts +++ b/target/linux/brcm63xx/dts/a226g.dts @@ -96,20 +96,27 @@ linux,part-probe = "bcm63xxpart"; - cfe@0 { - label = "CFE"; - reg = <0x000000 0x010000>; - read-only; - }; + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; - linux@10000 { - label = "linux"; - reg = <0x010000 0x7e0000>; - }; + cfe@0 { + label = "CFE"; + reg = <0x000000 0x010000>; + read-only; + }; - nvram@7f0000 { - label = "nvram"; - reg = <0x7f0000 0x010000>; + linux@10000 { + label = "linux"; + reg = <0x010000 0x7e0000>; + compatible = "brcm,bcm963xx-imagetag"; + }; + + nvram@7f0000 { + label = "nvram"; + reg = <0x7f0000 0x010000>; + }; }; }; diff --git a/target/linux/brcm63xx/dts/a226m-fwb.dts b/target/linux/brcm63xx/dts/a226m-fwb.dts index c21d06ec5b13..6c88d5378d9e 100644 --- a/target/linux/brcm63xx/dts/a226m-fwb.dts +++ b/target/linux/brcm63xx/dts/a226m-fwb.dts @@ -96,20 +96,27 @@ linux,part-probe = "bcm63xxpart"; - cfe@0 { - label = "CFE"; - reg = <0x000000 0x020000>; - read-only; - }; + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; - linux@20000 { - label = "linux"; - reg = <0x020000 0xfc0000>; - }; + cfe@0 { + label = "CFE"; + reg = <0x000000 0x020000>; + read-only; + }; - nvram@fe0000 { - label = "nvram"; - reg = <0xfe0000 0x020000>; + linux@10000 { + label = "linux"; + reg = <0x010000 0xfc0000>; + compatible = "brcm,bcm963xx-imagetag"; + }; + + nvram@7f0000 { + label = "nvram"; + reg = <0xfe0000 0x020000>; + }; }; }; diff --git a/target/linux/brcm63xx/dts/a226m.dts b/target/linux/brcm63xx/dts/a226m.dts index 7c8bdabf71a4..4918a870131b 100644 --- a/target/linux/brcm63xx/dts/a226m.dts +++ b/target/linux/brcm63xx/dts/a226m.dts @@ -96,20 +96,27 @@ linux,part-probe = "bcm63xxpart"; - cfe@0 { - label = "CFE"; - reg = <0x000000 0x010000>; - read-only; - }; + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; - linux@10000 { - label = "linux"; - reg = <0x010000 0x7e0000>; - }; + cfe@0 { + label = "CFE"; + reg = <0x000000 0x010000>; + read-only; + }; - nvram@7f0000 { - label = "nvram"; - reg = <0x7f0000 0x010000>; + linux@10000 { + label = "linux"; + reg = <0x010000 0x7e0000>; + compatible = "brcm,bcm963xx-imagetag"; + }; + + nvram@7f0000 { + label = "nvram"; + reg = <0x7f0000 0x010000>; + }; }; }; diff --git a/target/linux/brcm63xx/dts/a4001n.dts b/target/linux/brcm63xx/dts/a4001n.dts index db835434d88e..d99da824e5ba 100644 --- a/target/linux/brcm63xx/dts/a4001n.dts +++ b/target/linux/brcm63xx/dts/a4001n.dts @@ -69,25 +69,29 @@ spi-rx-bus-width = <2>; reg = <0>; - #address-cells = <1>; - #size-cells = <1>; - linux,part-probe = "bcm63xxpart"; - cfe@0 { - reg = <0x000000 0x010000>; - label = "cfe"; - read-only; - }; - - linux@10000 { - reg = <0x010000 0x7e0000>; - label = "linux"; - }; - - nvram@7f0000 { - reg = <0x7f0000 0x010000>; - label = "nvram"; + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + cfe@0 { + reg = <0x000000 0x010000>; + label = "cfe"; + read-only; + }; + + linux@10000 { + reg = <0x010000 0x7e0000>; + label = "linux"; + compatible = "brcm,bcm963xx-imagetag"; + }; + + nvram@7f0000 { + reg = <0x7f0000 0x010000>; + label = "nvram"; + }; }; }; }; diff --git a/target/linux/brcm63xx/dts/a4001n1.dts b/target/linux/brcm63xx/dts/a4001n1.dts index ad1590d7a0c5..7306e90275f2 100644 --- a/target/linux/brcm63xx/dts/a4001n1.dts +++ b/target/linux/brcm63xx/dts/a4001n1.dts @@ -102,20 +102,27 @@ linux,part-probe = "bcm63xxpart"; - cfe@0 { - reg = <0x000000 0x010000>; - label = "cfe"; - read-only; - }; - - linux@10000 { - reg = <0x010000 0xfe0000>; - label = "linux"; - }; - - nvram@ff0000 { - reg = <0xff0000 0x010000>; - label = "nvram"; + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + cfe@0 { + reg = <0x000000 0x010000>; + label = "cfe"; + read-only; + }; + + linux@10000 { + reg = <0x010000 0xfe0000>; + label = "linux"; + compatible = "brcm,bcm963xx-imagetag"; + }; + + nvram@ff0000 { + reg = <0xff0000 0x010000>; + label = "nvram"; + }; }; }; }; diff --git a/target/linux/brcm63xx/dts/ad1018-nor.dts b/target/linux/brcm63xx/dts/ad1018-nor.dts index 7a630a185648..5ce19db3352a 100644 --- a/target/linux/brcm63xx/dts/ad1018-nor.dts +++ b/target/linux/brcm63xx/dts/ad1018-nor.dts @@ -133,6 +133,10 @@ #size-cells = <1>; linux,part-probe = "bcm63xxpart"; + + partitions { + compatible = "brcm,bcm963xx-cfe-nor-partitions"; + }; }; }; diff --git a/target/linux/brcm63xx/dts/agpf-s0.dts b/target/linux/brcm63xx/dts/agpf-s0.dts index 6ac3801c3889..140ebfae9ff4 100644 --- a/target/linux/brcm63xx/dts/agpf-s0.dts +++ b/target/linux/brcm63xx/dts/agpf-s0.dts @@ -100,20 +100,27 @@ linux,part-probe = "bcm63xxpart"; - cfe@0 { - label = "CFE"; - reg = <0x000000 0x020000>; - read-only; - }; + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; - linux@20000 { - label = "linux"; - reg = <0x020000 0xfc0000>; - }; + cfe@0 { + label = "CFE"; + reg = <0x000000 0x020000>; + read-only; + }; - nvram@fe0000 { - label = "nvram"; - reg = <0xfe0000 0x020000>; + linux@20000 { + label = "linux"; + reg = <0x020000 0xfc0000>; + compatible = "brcm,bcm963xx-imagetag"; + }; + + nvram@fe0000 { + label = "nvram"; + reg = <0xfe0000 0x020000>; + }; }; }; diff --git a/target/linux/brcm63xx/dts/ar-5315u.dts b/target/linux/brcm63xx/dts/ar-5315u.dts index e359fe4ebbdb..5c5d7c6dd5b9 100644 --- a/target/linux/brcm63xx/dts/ar-5315u.dts +++ b/target/linux/brcm63xx/dts/ar-5315u.dts @@ -82,20 +82,28 @@ linux,part-probe = "bcm63xxpart"; - cfe@0 { - reg = <0x000000 0x010000>; - label = "cfe"; - read-only; - }; - - linux@10000 { - reg = <0x010000 0xfe0000>; - label = "linux"; - }; - nvram@ff0000 { - reg = <0xff0000 0x010000>; - label = "nvram"; + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + cfe@0 { + reg = <0x000000 0x010000>; + label = "cfe"; + read-only; + }; + + linux@10000 { + reg = <0x010000 0xfe0000>; + label = "linux"; + compatible = "brcm,bcm963xx-imagetag"; + }; + + nvram@ff0000 { + reg = <0xff0000 0x010000>; + label = "nvram"; + }; }; }; }; diff --git a/target/linux/brcm63xx/dts/ar-5381u.dts b/target/linux/brcm63xx/dts/ar-5381u.dts index 9da5b7e3cdf1..c3ed00a5f45e 100644 --- a/target/linux/brcm63xx/dts/ar-5381u.dts +++ b/target/linux/brcm63xx/dts/ar-5381u.dts @@ -61,20 +61,27 @@ linux,part-probe = "bcm63xxpart"; - cfe@0 { - reg = <0x000000 0x010000>; - label = "cfe"; - read-only; - }; - - linux@10000 { - reg = <0x010000 0xfe0000>; - label = "linux"; - }; - - nvram@ff0000 { - reg = <0xff0000 0x010000>; - label = "nvram"; + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + cfe@0 { + reg = <0x000000 0x010000>; + label = "cfe"; + read-only; + }; + + linux@10000 { + reg = <0x010000 0xfe0000>; + label = "linux"; + compatible = "brcm,bcm963xx-imagetag"; + }; + + nvram@ff0000 { + reg = <0xff0000 0x010000>; + label = "nvram"; + }; }; }; }; diff --git a/target/linux/brcm63xx/dts/ar-5387un.dts b/target/linux/brcm63xx/dts/ar-5387un.dts index 4dd71459fc05..9b54fda74dd5 100644 --- a/target/linux/brcm63xx/dts/ar-5387un.dts +++ b/target/linux/brcm63xx/dts/ar-5387un.dts @@ -69,20 +69,27 @@ linux,part-probe = "bcm63xxpart"; - cfe@0 { - reg = <0x000000 0x010000>; - label = "cfe"; - read-only; - }; - - linux@10000 { - reg = <0x010000 0xfe0000>; - label = "linux"; - }; - - nvram@ff0000 { - reg = <0xff0000 0x010000>; - label = "nvram"; + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + cfe@0 { + reg = <0x000000 0x010000>; + label = "cfe"; + read-only; + }; + + linux@10000 { + reg = <0x010000 0xfe0000>; + label = "linux"; + compatible = "brcm,bcm963xx-imagetag"; + }; + + nvram@ff0000 { + reg = <0xff0000 0x010000>; + label = "nvram"; + }; }; }; }; diff --git a/target/linux/brcm63xx/dts/ar1004g.dts b/target/linux/brcm63xx/dts/ar1004g.dts index e7265f4d4bee..600245c63a76 100644 --- a/target/linux/brcm63xx/dts/ar1004g.dts +++ b/target/linux/brcm63xx/dts/ar1004g.dts @@ -51,20 +51,27 @@ linux,part-probe = "bcm63xxpart"; - cfe@0 { - label = "CFE"; - reg = <0x000000 0x010000>; - read-only; - }; + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; - linux@10000 { - label = "linux"; - reg = <0x010000 0x3e0000>; - }; + cfe@0 { + label = "CFE"; + reg = <0x000000 0x010000>; + read-only; + }; - nvram@3f0000 { - label = "nvram"; - reg = <0x3f0000 0x010000>; + linux@10000 { + label = "linux"; + reg = <0x010000 0x3e0000>; + compatible = "brcm,bcm963xx-imagetag"; + }; + + nvram@3f0000 { + label = "nvram"; + reg = <0x3f0000 0x010000>; + }; }; }; diff --git a/target/linux/brcm63xx/dts/av4202n.dts b/target/linux/brcm63xx/dts/av4202n.dts index ef61607882d2..138d8c0ff1de 100644 --- a/target/linux/brcm63xx/dts/av4202n.dts +++ b/target/linux/brcm63xx/dts/av4202n.dts @@ -73,20 +73,27 @@ linux,part-probe = "bcm63xxpart"; - cfe@0 { - label = "CFE"; - reg = <0x000000 0x020000>; - read-only; - }; + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; - linux@20000 { - label = "linux"; - reg = <0x020000 0xfc0000>; - }; + cfe@0 { + label = "CFE"; + reg = <0x000000 0x020000>; + read-only; + }; - nvram@fe0000 { - label = "nvram"; - reg = <0xfe0000 0x020000>; + linux@20000 { + label = "linux"; + reg = <0x020000 0xfc0000>; + compatible = "brcm,bcm963xx-imagetag"; + }; + + nvram@fe0000 { + label = "nvram"; + reg = <0xfe0000 0x020000>; + }; }; }; diff --git a/target/linux/brcm63xx/dts/bcm96318ref.dts b/target/linux/brcm63xx/dts/bcm96318ref.dts index e48c0bf46e0c..2d19eeaeeec4 100644 --- a/target/linux/brcm63xx/dts/bcm96318ref.dts +++ b/target/linux/brcm63xx/dts/bcm96318ref.dts @@ -67,6 +67,10 @@ #size-cells = <1>; linux,part-probe = "bcm63xxpart"; + + partitions { + compatible = "brcm,bcm963xx-cfe-nor-partitions"; + }; }; }; diff --git a/target/linux/brcm63xx/dts/bcm96318ref_p300.dts b/target/linux/brcm63xx/dts/bcm96318ref_p300.dts index db9d5eccd67b..fb8ad78512b4 100644 --- a/target/linux/brcm63xx/dts/bcm96318ref_p300.dts +++ b/target/linux/brcm63xx/dts/bcm96318ref_p300.dts @@ -73,6 +73,10 @@ #size-cells = <1>; linux,part-probe = "bcm63xxpart"; + + partitions { + compatible = "brcm,bcm963xx-cfe-nor-partitions"; + }; }; }; diff --git a/target/linux/brcm63xx/dts/bcm963268bu_p300.dts b/target/linux/brcm63xx/dts/bcm963268bu_p300.dts index 2bccb57a9847..2c9875644ae1 100644 --- a/target/linux/brcm63xx/dts/bcm963268bu_p300.dts +++ b/target/linux/brcm63xx/dts/bcm963268bu_p300.dts @@ -48,6 +48,10 @@ #size-cells = <1>; linux,part-probe = "bcm63xxpart"; + + partitions { + compatible = "brcm,bcm963xx-cfe-nor-partitions"; + }; }; }; diff --git a/target/linux/brcm63xx/dts/bcm963269bhr.dts b/target/linux/brcm63xx/dts/bcm963269bhr.dts index d3c709877b5f..ad31adfdfe8a 100644 --- a/target/linux/brcm63xx/dts/bcm963269bhr.dts +++ b/target/linux/brcm63xx/dts/bcm963269bhr.dts @@ -56,6 +56,10 @@ #size-cells = <1>; linux,part-probe = "bcm63xxpart"; + + partitions { + compatible = "brcm,bcm963xx-cfe-nor-partitions"; + }; }; }; diff --git a/target/linux/brcm63xx/dts/bcm963281TAN.dts b/target/linux/brcm63xx/dts/bcm963281TAN.dts index d0d19a3550d4..b280cb0bc1cc 100644 --- a/target/linux/brcm63xx/dts/bcm963281TAN.dts +++ b/target/linux/brcm63xx/dts/bcm963281TAN.dts @@ -58,6 +58,10 @@ #size-cells = <1>; linux,part-probe = "bcm63xxpart"; + + partitions { + compatible = "brcm,bcm963xx-cfe-nor-partitions"; + }; }; }; diff --git a/target/linux/brcm63xx/dts/bcm96328avng.dts b/target/linux/brcm63xx/dts/bcm96328avng.dts index d0d67880e474..24e658e8d2a8 100644 --- a/target/linux/brcm63xx/dts/bcm96328avng.dts +++ b/target/linux/brcm63xx/dts/bcm96328avng.dts @@ -58,6 +58,10 @@ #size-cells = <1>; linux,part-probe = "bcm63xxpart"; + + partitions { + compatible = "brcm,bcm963xx-cfe-nor-partitions"; + }; }; }; diff --git a/target/linux/brcm63xx/dts/bcm96338GW.dts b/target/linux/brcm63xx/dts/bcm96338GW.dts index d6ff449d312a..741a695af39a 100644 --- a/target/linux/brcm63xx/dts/bcm96338GW.dts +++ b/target/linux/brcm63xx/dts/bcm96338GW.dts @@ -44,6 +44,10 @@ status = "ok"; linux,part-probe = "bcm63xxpart"; + + partitions { + compatible = "brcm,bcm963xx-cfe-nor-partitions"; + }; }; &uart0 { diff --git a/target/linux/brcm63xx/dts/bcm96338W.dts b/target/linux/brcm63xx/dts/bcm96338W.dts index f91ca9a39945..674b3993c974 100644 --- a/target/linux/brcm63xx/dts/bcm96338W.dts +++ b/target/linux/brcm63xx/dts/bcm96338W.dts @@ -44,6 +44,10 @@ status = "ok"; linux,part-probe = "bcm63xxpart"; + + partitions { + compatible = "brcm,bcm963xx-cfe-nor-partitions"; + }; }; &uart0 { diff --git a/target/linux/brcm63xx/dts/bcm96345GW2.dts b/target/linux/brcm63xx/dts/bcm96345GW2.dts index a7b3fad13606..e329b019278d 100644 --- a/target/linux/brcm63xx/dts/bcm96345GW2.dts +++ b/target/linux/brcm63xx/dts/bcm96345GW2.dts @@ -18,6 +18,10 @@ status = "ok"; linux,part-probe = "bcm63xxpart"; + + partitions { + compatible = "brcm,bcm963xx-cfe-nor-partitions"; + }; }; &uart0 { diff --git a/target/linux/brcm63xx/dts/bcm96348GW-10.dts b/target/linux/brcm63xx/dts/bcm96348GW-10.dts index 59850b5a1026..742fefd28daa 100644 --- a/target/linux/brcm63xx/dts/bcm96348GW-10.dts +++ b/target/linux/brcm63xx/dts/bcm96348GW-10.dts @@ -58,6 +58,10 @@ status = "ok"; linux,part-probe = "bcm63xxpart"; + + partitions { + compatible = "brcm,bcm963xx-cfe-nor-partitions"; + }; }; &pinctrl { diff --git a/target/linux/brcm63xx/dts/bcm96348GW-11.dts b/target/linux/brcm63xx/dts/bcm96348GW-11.dts index 3caca09707e4..30f77d9c08b1 100644 --- a/target/linux/brcm63xx/dts/bcm96348GW-11.dts +++ b/target/linux/brcm63xx/dts/bcm96348GW-11.dts @@ -58,6 +58,10 @@ status = "ok"; linux,part-probe = "bcm63xxpart"; + + partitions { + compatible = "brcm,bcm963xx-cfe-nor-partitions"; + }; }; &pinctrl { diff --git a/target/linux/brcm63xx/dts/bcm96348GW.dts b/target/linux/brcm63xx/dts/bcm96348GW.dts index c213ac7a1f1d..0713cec714e7 100644 --- a/target/linux/brcm63xx/dts/bcm96348GW.dts +++ b/target/linux/brcm63xx/dts/bcm96348GW.dts @@ -58,6 +58,10 @@ status = "ok"; linux,part-probe = "bcm63xxpart"; + + partitions { + compatible = "brcm,bcm963xx-cfe-nor-partitions"; + }; }; &pinctrl { diff --git a/target/linux/brcm63xx/dts/bcm96348R.dts b/target/linux/brcm63xx/dts/bcm96348R.dts index b56869b3e465..b15c6ccc0ca5 100644 --- a/target/linux/brcm63xx/dts/bcm96348R.dts +++ b/target/linux/brcm63xx/dts/bcm96348R.dts @@ -44,6 +44,10 @@ status = "ok"; linux,part-probe = "bcm63xxpart"; + + partitions { + compatible = "brcm,bcm963xx-cfe-nor-partitions"; + }; }; &pinctrl { diff --git a/target/linux/brcm63xx/dts/bcm96358VW.dts b/target/linux/brcm63xx/dts/bcm96358VW.dts index e097c0518ee3..ca9238829aa3 100644 --- a/target/linux/brcm63xx/dts/bcm96358VW.dts +++ b/target/linux/brcm63xx/dts/bcm96358VW.dts @@ -44,6 +44,10 @@ status = "ok"; linux,part-probe = "bcm63xxpart"; + + partitions { + compatible = "brcm,bcm963xx-cfe-nor-partitions"; + }; }; &uart0 { diff --git a/target/linux/brcm63xx/dts/bcm96358VW2.dts b/target/linux/brcm63xx/dts/bcm96358VW2.dts index 5c242c2157ba..8eebd1c42483 100644 --- a/target/linux/brcm63xx/dts/bcm96358VW2.dts +++ b/target/linux/brcm63xx/dts/bcm96358VW2.dts @@ -40,6 +40,10 @@ status = "ok"; linux,part-probe = "bcm63xxpart"; + + partitions { + compatible = "brcm,bcm963xx-cfe-nor-partitions"; + }; }; &uart0 { diff --git a/target/linux/brcm63xx/dts/bcm96368MVNgr.dts b/target/linux/brcm63xx/dts/bcm96368MVNgr.dts index 6c4ef091ac79..0b1773d27d48 100644 --- a/target/linux/brcm63xx/dts/bcm96368MVNgr.dts +++ b/target/linux/brcm63xx/dts/bcm96368MVNgr.dts @@ -44,6 +44,10 @@ status = "ok"; linux,part-probe = "bcm63xxpart"; + + partitions { + compatible = "brcm,bcm963xx-cfe-nor-partitions"; + }; }; &pinctrl { diff --git a/target/linux/brcm63xx/dts/bcm96368MVWG.dts b/target/linux/brcm63xx/dts/bcm96368MVWG.dts index ed1dd90160b5..172abd2cf7fa 100644 --- a/target/linux/brcm63xx/dts/bcm96368MVWG.dts +++ b/target/linux/brcm63xx/dts/bcm96368MVWG.dts @@ -44,6 +44,10 @@ status = "ok"; linux,part-probe = "bcm63xxpart"; + + partitions { + compatible = "brcm,bcm963xx-cfe-nor-partitions"; + }; }; &pinctrl { diff --git a/target/linux/brcm63xx/dts/cpva502plus.dts b/target/linux/brcm63xx/dts/cpva502plus.dts index 6d8455e91c93..023970acabba 100644 --- a/target/linux/brcm63xx/dts/cpva502plus.dts +++ b/target/linux/brcm63xx/dts/cpva502plus.dts @@ -47,20 +47,27 @@ linux,part-probe = "bcm63xxpart"; - cfe@0 { - label = "CFE"; - reg = <0x000000 0x010000>; - read-only; - }; + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; - linux@10000 { - label = "linux"; - reg = <0x010000 0x3e0000>; - }; + cfe@0 { + label = "CFE"; + reg = <0x000000 0x010000>; + read-only; + }; - nvram@3f0000 { - label = "nvram"; - reg = <0x3f0000 0x010000>; + linux@10000 { + label = "linux"; + reg = <0x010000 0x3e0000>; + compatible = "brcm,bcm963xx-imagetag"; + }; + + nvram@3f0000 { + label = "nvram"; + reg = <0x3f0000 0x010000>; + }; }; }; diff --git a/target/linux/brcm63xx/dts/cpva642.dts b/target/linux/brcm63xx/dts/cpva642.dts index 212bf6c32a6f..ba0426ae552d 100644 --- a/target/linux/brcm63xx/dts/cpva642.dts +++ b/target/linux/brcm63xx/dts/cpva642.dts @@ -84,20 +84,27 @@ linux,part-probe = "bcm63xxpart"; - cfe@0 { - label = "CFE"; - reg = <0x000000 0x010000>; - read-only; - }; + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; - linux@10000 { - label = "linux"; - reg = <0x010000 0x7e0000>; - }; + cfe@0 { + label = "CFE"; + reg = <0x000000 0x010000>; + read-only; + }; - nvram@7f0000 { - label = "nvram"; - reg = <0x7f0000 0x010000>; + linux@10000 { + label = "linux"; + reg = <0x010000 0x7e0000>; + compatible = "brcm,bcm963xx-imagetag"; + }; + + nvram@7f0000 { + label = "nvram"; + reg = <0x7f0000 0x010000>; + }; }; }; diff --git a/target/linux/brcm63xx/dts/ct-5365.dts b/target/linux/brcm63xx/dts/ct-5365.dts index ac3b80954fb6..3598f912ccd5 100644 --- a/target/linux/brcm63xx/dts/ct-5365.dts +++ b/target/linux/brcm63xx/dts/ct-5365.dts @@ -61,20 +61,27 @@ linux,part-probe = "bcm63xxpart"; - cfe@0 { - label = "CFE"; - reg = <0x000000 0x010000>; - read-only; - }; + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; - linux@10000 { - label = "linux"; - reg = <0x010000 0x3e0000>; - }; + cfe@0 { + label = "CFE"; + reg = <0x000000 0x010000>; + read-only; + }; - nvram@3f0000 { - label = "nvram"; - reg = <0x3f0000 0x010000>; + linux@10000 { + label = "linux"; + reg = <0x010000 0x3e0000>; + compatible = "brcm,bcm963xx-imagetag"; + }; + + nvram@3f0000 { + label = "nvram"; + reg = <0x3f0000 0x010000>; + }; }; }; diff --git a/target/linux/brcm63xx/dts/ct-6373.dts b/target/linux/brcm63xx/dts/ct-6373.dts index 579b514f93dc..e6069bcd067e 100644 --- a/target/linux/brcm63xx/dts/ct-6373.dts +++ b/target/linux/brcm63xx/dts/ct-6373.dts @@ -82,20 +82,27 @@ linux,part-probe = "bcm63xxpart"; - cfe@0 { - label = "CFE"; - reg = <0x000000 0x010000>; - read-only; - }; + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; - linux@10000 { - label = "linux"; - reg = <0x010000 0x7e0000>; - }; + cfe@0 { + label = "CFE"; + reg = <0x000000 0x010000>; + read-only; + }; - nvram@7f0000 { - label = "nvram"; - reg = <0x7f0000 0x010000>; + linux@10000 { + label = "linux"; + reg = <0x010000 0x7e0000>; + compatible = "brcm,bcm963xx-imagetag"; + }; + + nvram@7f0000 { + label = "nvram"; + reg = <0x7f0000 0x010000>; + }; }; }; diff --git a/target/linux/brcm63xx/dts/ct536plus.dts b/target/linux/brcm63xx/dts/ct536plus.dts index f9bc7e136c7d..9c075a54ce95 100644 --- a/target/linux/brcm63xx/dts/ct536plus.dts +++ b/target/linux/brcm63xx/dts/ct536plus.dts @@ -47,20 +47,27 @@ linux,part-probe = "bcm63xxpart"; - cfe@0 { - label = "CFE"; - reg = <0x000000 0x010000>; - read-only; - }; + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; - linux@10000 { - label = "linux"; - reg = <0x010000 0x3e0000>; - }; + cfe@0 { + label = "CFE"; + reg = <0x000000 0x010000>; + read-only; + }; - nvram@3f0000 { - label = "nvram"; - reg = <0x3f0000 0x010000>; + linux@10000 { + label = "linux"; + reg = <0x010000 0x3e0000>; + compatible = "brcm,bcm963xx-imagetag"; + }; + + nvram@3f0000 { + label = "nvram"; + reg = <0x3f0000 0x010000>; + }; }; }; diff --git a/target/linux/brcm63xx/dts/cvg834g.dts b/target/linux/brcm63xx/dts/cvg834g.dts index fa14c8bbd951..ad71eb39989d 100644 --- a/target/linux/brcm63xx/dts/cvg834g.dts +++ b/target/linux/brcm63xx/dts/cvg834g.dts @@ -29,20 +29,27 @@ linux,part-probe = "bcm63xxpart"; - cfe@0 { - label = "CFE"; - reg = <0x000000 0x010000>; - read-only; - }; + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + cfe@0 { + label = "CFE"; + reg = <0x000000 0x010000>; + read-only; + }; - linux@10000 { - label = "linux"; - reg = <0x010000 0x3e0000>; - }; + linux@10000 { + label = "linux"; + reg = <0x010000 0x3e0000>; + compatible = "brcm,bcm963xx-imagetag"; + }; - nvram@3f0000 { - label = "nvram"; - reg = <0x3f0000 0x010000>; + nvram@3f0000 { + label = "nvram"; + reg = <0x3f0000 0x010000>; + }; }; }; diff --git a/target/linux/brcm63xx/dts/dg834g_v4.dts b/target/linux/brcm63xx/dts/dg834g_v4.dts index 369a67c2220b..019fe49e279e 100644 --- a/target/linux/brcm63xx/dts/dg834g_v4.dts +++ b/target/linux/brcm63xx/dts/dg834g_v4.dts @@ -55,20 +55,27 @@ linux,part-probe = "bcm63xxpart"; - cfe@0 { - label = "CFE"; - reg = <0x000000 0x010000>; - read-only; - }; + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; - linux@10000 { - label = "linux"; - reg = <0x010000 0x3e0000>; - }; + cfe@0 { + label = "CFE"; + reg = <0x000000 0x010000>; + read-only; + }; - nvram@3f0000 { - label = "nvram"; - reg = <0x3f0000 0x010000>; + linux@10000 { + label = "linux"; + reg = <0x010000 0x3e0000>; + compatible = "brcm,bcm963xx-imagetag"; + }; + + nvram@3f0000 { + label = "nvram"; + reg = <0x3f0000 0x010000>; + }; }; }; diff --git a/target/linux/brcm63xx/dts/dg834gtpn.dts b/target/linux/brcm63xx/dts/dg834gtpn.dts index 794c701dadcb..694af6ad5b07 100644 --- a/target/linux/brcm63xx/dts/dg834gtpn.dts +++ b/target/linux/brcm63xx/dts/dg834gtpn.dts @@ -59,20 +59,27 @@ linux,part-probe = "bcm63xxpart"; - cfe@0 { - label = "CFE"; - reg = <0x000000 0x010000>; - read-only; - }; + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; - linux@10000 { - label = "linux"; - reg = <0x010000 0x3e0000>; - }; + cfe@0 { + label = "CFE"; + reg = <0x000000 0x010000>; + read-only; + }; - nvram@3f0000 { - label = "nvram"; - reg = <0x3f0000 0x010000>; + linux@10000 { + label = "linux"; + reg = <0x010000 0x3e0000>; + compatible = "brcm,bcm963xx-imagetag"; + }; + + nvram@3f0000 { + label = "nvram"; + reg = <0x3f0000 0x010000>; + }; }; }; diff --git a/target/linux/brcm63xx/dts/dgnd3700v1.dts b/target/linux/brcm63xx/dts/dgnd3700v1.dts index 2d23f19b7ad8..3a556b3562a6 100644 --- a/target/linux/brcm63xx/dts/dgnd3700v1.dts +++ b/target/linux/brcm63xx/dts/dgnd3700v1.dts @@ -93,26 +93,33 @@ linux,part-probe = "bcm63xxpart"; - cfe@0 { - label = "CFE"; - reg = <0x000000 0x020000>; - read-only; - }; + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; - linux@20000 { - label = "linux"; - reg = <0x020000 0x1e20000>; - }; + cfe@0 { + label = "CFE"; + reg = <0x000000 0x020000>; + read-only; + }; - board_data@1e40000 { - label = "board_data"; - reg = <0x1e40000 0x1a0000>; - read-only; - }; + linux@20000 { + label = "linux"; + reg = <0x020000 0x1e20000>; + compatible = "brcm,bcm963xx-imagetag"; + }; + + board_data@1e40000 { + label = "board_data"; + reg = <0x1e40000 0x1a0000>; + read-only; + }; - nvram@1fe0000 { - label = "nvram"; - reg = <0x1fe0000 0x20000>; + nvram@1fe0000 { + label = "nvram"; + reg = <0x1fe0000 0x20000>; + }; }; }; diff --git a/target/linux/brcm63xx/dts/dsl-2640b-b.dts b/target/linux/brcm63xx/dts/dsl-2640b-b.dts index df7f4adc0765..0acb5c6e76a0 100644 --- a/target/linux/brcm63xx/dts/dsl-2640b-b.dts +++ b/target/linux/brcm63xx/dts/dsl-2640b-b.dts @@ -55,20 +55,27 @@ linux,part-probe = "bcm63xxpart"; - cfe@0 { - label = "CFE"; - reg = <0x000000 0x010000>; - read-only; - }; + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; - linux@10000 { - label = "linux"; - reg = <0x010000 0x3e0000>; - }; + cfe@0 { + label = "CFE"; + reg = <0x000000 0x010000>; + read-only; + }; - nvram@3f0000 { - label = "nvram"; - reg = <0x3f0000 0x010000>; + linux@10000 { + label = "linux"; + reg = <0x010000 0x3e0000>; + compatible = "brcm,bcm963xx-imagetag"; + }; + + nvram@3f0000 { + label = "nvram"; + reg = <0x3f0000 0x010000>; + }; }; }; diff --git a/target/linux/brcm63xx/dts/dsl-2640u.dts b/target/linux/brcm63xx/dts/dsl-2640u.dts index 8fea2acb254e..e6d1819257ad 100644 --- a/target/linux/brcm63xx/dts/dsl-2640u.dts +++ b/target/linux/brcm63xx/dts/dsl-2640u.dts @@ -39,20 +39,27 @@ linux,part-probe = "bcm63xxpart"; - cfe@0 { - label = "CFE"; - reg = <0x000000 0x010000>; - read-only; - }; + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; - linux@10000 { - label = "linux"; - reg = <0x010000 0x3e0000>; - }; + cfe@0 { + label = "CFE"; + reg = <0x000000 0x010000>; + read-only; + }; - nvram@3f0000 { - label = "nvram"; - reg = <0x3f0000 0x010000>; + linux@10000 { + label = "linux"; + reg = <0x010000 0x3e0000>; + compatible = "brcm,bcm963xx-imagetag"; + }; + + nvram@3f0000 { + label = "nvram"; + reg = <0x3f0000 0x010000>; + }; }; }; diff --git a/target/linux/brcm63xx/dts/dsl-2650u.dts b/target/linux/brcm63xx/dts/dsl-2650u.dts index c9b189b8b0da..22b1d52417ee 100644 --- a/target/linux/brcm63xx/dts/dsl-2650u.dts +++ b/target/linux/brcm63xx/dts/dsl-2650u.dts @@ -41,20 +41,27 @@ linux,part-probe = "bcm63xxpart"; - cfe@0 { - label = "CFE"; - reg = <0x000000 0x010000>; - read-only; - }; + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; - linux@10000 { - label = "linux"; - reg = <0x010000 0x7e0000>; - }; + cfe@0 { + label = "CFE"; + reg = <0x000000 0x010000>; + read-only; + }; - nvram@7f0000 { - label = "nvram"; - reg = <0x7f0000 0x010000>; + linux@10000 { + label = "linux"; + reg = <0x010000 0x7e0000>; + compatible = "brcm,bcm963xx-imagetag"; + }; + + nvram@7f0000 { + label = "nvram"; + reg = <0x7f0000 0x010000>; + }; }; }; diff --git a/target/linux/brcm63xx/dts/dsl-274xb-c.dts b/target/linux/brcm63xx/dts/dsl-274xb-c.dts index 3468dea8b3a4..bab04271e79c 100644 --- a/target/linux/brcm63xx/dts/dsl-274xb-c.dts +++ b/target/linux/brcm63xx/dts/dsl-274xb-c.dts @@ -59,20 +59,27 @@ linux,part-probe = "bcm63xxpart"; - cfe@0 { - label = "CFE"; - reg = <0x000000 0x010000>; - read-only; - }; + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; - linux@10000 { - label = "linux"; - reg = <0x010000 0x3e0000>; - }; + cfe@0 { + label = "CFE"; + reg = <0x000000 0x010000>; + read-only; + }; - nvram@3f0000 { - label = "nvram"; - reg = <0x3f0000 0x010000>; + linux@10000 { + label = "linux"; + reg = <0x010000 0x3e0000>; + compatible = "brcm,bcm963xx-imagetag"; + }; + + nvram@3f0000 { + label = "nvram"; + reg = <0x3f0000 0x010000>; + }; }; }; diff --git a/target/linux/brcm63xx/dts/dsl-274xb-f.dts b/target/linux/brcm63xx/dts/dsl-274xb-f.dts index 00a5a9e99a05..8555bb4f2cb4 100644 --- a/target/linux/brcm63xx/dts/dsl-274xb-f.dts +++ b/target/linux/brcm63xx/dts/dsl-274xb-f.dts @@ -83,26 +83,33 @@ linux,part-probe = "bcm63xxpart"; - cfe@0 { - reg = <0x000000 0x010000>; - label = "cfe"; - read-only; - }; - - linux@10000 { - reg = <0x010000 0x7c0000>; - label = "linux"; - }; - - cal_data@7d0000 { - reg = <0x7d0000 0x010000>; - label = "cal_data"; - read-only; - }; - - nvram@7e0000 { - reg = <0x7e0000 0x020000>; - label = "nvram"; + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + cfe@0 { + reg = <0x000000 0x010000>; + label = "cfe"; + read-only; + }; + + linux@10000 { + reg = <0x010000 0x7c0000>; + label = "linux"; + compatible = "brcm,bcm963xx-imagetag"; + }; + + cal_data@7d0000 { + reg = <0x7d0000 0x010000>; + label = "cal_data"; + read-only; + }; + + nvram@7e0000 { + reg = <0x7e0000 0x020000>; + label = "nvram"; + }; }; }; }; diff --git a/target/linux/brcm63xx/dts/dsl-275xb-d.dts b/target/linux/brcm63xx/dts/dsl-275xb-d.dts index d8f8c08e1ea6..c801fcab2661 100644 --- a/target/linux/brcm63xx/dts/dsl-275xb-d.dts +++ b/target/linux/brcm63xx/dts/dsl-275xb-d.dts @@ -96,20 +96,27 @@ linux,part-probe = "bcm63xxpart"; - cfe@0 { - reg = <0x000000 0x010000>; - label = "cfe"; - read-only; - }; - - linux@10000 { - reg = <0x010000 0x7e0000>; - label = "linux"; - }; - - nvram@7f0000 { - reg = <0x7f0000 0x010000>; - label = "nvram"; + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + cfe@0 { + reg = <0x000000 0x010000>; + label = "cfe"; + read-only; + }; + + linux@10000 { + reg = <0x010000 0x7e0000>; + label = "linux"; + compatible = "brcm,bcm963xx-imagetag"; + }; + + nvram@7f0000 { + reg = <0x7f0000 0x010000>; + label = "nvram"; + }; }; }; }; diff --git a/target/linux/brcm63xx/dts/dv-201amr.dts b/target/linux/brcm63xx/dts/dv-201amr.dts index 42a825f923f9..c13093228d2f 100644 --- a/target/linux/brcm63xx/dts/dv-201amr.dts +++ b/target/linux/brcm63xx/dts/dv-201amr.dts @@ -19,20 +19,27 @@ linux,part-probe = "bcm63xxpart"; - backup@0 { - label = "backup"; - reg = <0x000000 0x400000>; - }; - - cfe@400000 { - label = "cfe"; - reg = <0x400000 0x010000>; - read-only; - }; - - linux@410000 { - label = "linux"; - reg = <0x410000 0x3f0000>; + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + backup@0 { + label = "backup"; + reg = <0x000000 0x400000>; + }; + + cfe@400000 { + label = "cfe"; + reg = <0x400000 0x010000>; + read-only; + }; + + linux@410000 { + label = "linux"; + reg = <0x410000 0x3f0000>; + compatible = "brcm,bcm963xx-imagetag"; + }; }; }; diff --git a/target/linux/brcm63xx/dts/dva-g3810bn_tl.dts b/target/linux/brcm63xx/dts/dva-g3810bn_tl.dts index 2945165ce175..3478657f19d8 100644 --- a/target/linux/brcm63xx/dts/dva-g3810bn_tl.dts +++ b/target/linux/brcm63xx/dts/dva-g3810bn_tl.dts @@ -59,20 +59,27 @@ linux,part-probe = "bcm63xxpart"; - cfe@0 { - label = "CFE"; - reg = <0x000000 0x010000>; - read-only; - }; + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; - linux@10000 { - label = "linux"; - reg = <0x010000 0x7e0000>; - }; + cfe@0 { + label = "CFE"; + reg = <0x000000 0x010000>; + read-only; + }; - nvram@7f0000 { - label = "nvram"; - reg = <0x7f0000 0x010000>; + linux@10000 { + label = "linux"; + reg = <0x010000 0x7e0000>; + compatible = "brcm,bcm963xx-imagetag"; + }; + + nvram@7f0000 { + label = "nvram"; + reg = <0x7f0000 0x010000>; + }; }; }; diff --git a/target/linux/brcm63xx/dts/evg2000.dts b/target/linux/brcm63xx/dts/evg2000.dts index 10e0ddcc93cd..2d254fb03c58 100644 --- a/target/linux/brcm63xx/dts/evg2000.dts +++ b/target/linux/brcm63xx/dts/evg2000.dts @@ -84,26 +84,33 @@ linux,part-probe = "bcm63xxpart"; - cfe@0 { - label = "CFE"; - reg = <0x00000000 0x00020000>; - read-only; - }; + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; - linux@20000 { - label = "linux"; - reg = <0x00020000 0x00f40000>; - }; + cfe@0 { + label = "CFE"; + reg = <0x00000000 0x00020000>; + read-only; + }; - board_data@f60000 { - label = "board_data"; - reg = <0x00f60000 0x00080000>; - read-only; - }; + linux@20000 { + label = "linux"; + reg = <0x00020000 0x00f40000>; + compatible = "brcm,bcm963xx-imagetag"; + }; + + board_data@f60000 { + label = "board_data"; + reg = <0x00f60000 0x00080000>; + read-only; + }; - nvram@fe0000 { - label = "nvram"; - reg = <0x00fe0000 0x00020000>; + nvram@fe0000 { + label = "nvram"; + reg = <0x00fe0000 0x00020000>; + }; }; }; diff --git a/target/linux/brcm63xx/dts/f5d7633.dts b/target/linux/brcm63xx/dts/f5d7633.dts index 89c646b9230e..621ef0b3e1e9 100644 --- a/target/linux/brcm63xx/dts/f5d7633.dts +++ b/target/linux/brcm63xx/dts/f5d7633.dts @@ -59,20 +59,27 @@ linux,part-probe = "bcm63xxpart"; - cfe@0 { - label = "CFE"; - reg = <0x000000 0x020000>; - read-only; - }; + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; - linux@20000 { - label = "linux"; - reg = <0x020000 0x3c0000>; - }; + cfe@0 { + label = "CFE"; + reg = <0x000000 0x020000>; + read-only; + }; - nvram@3e0000 { - label = "nvram"; - reg = <0x3e0000 0x020000>; + linux@20000 { + label = "linux"; + reg = <0x020000 0x3c0000>; + compatible = "brcm,bcm963xx-imagetag"; + }; + + nvram@3e0000 { + label = "nvram"; + reg = <0x3e0000 0x020000>; + }; }; }; diff --git a/target/linux/brcm63xx/dts/fast2404.dts b/target/linux/brcm63xx/dts/fast2404.dts index c0a30a08eadf..8fde61621a1d 100644 --- a/target/linux/brcm63xx/dts/fast2404.dts +++ b/target/linux/brcm63xx/dts/fast2404.dts @@ -19,20 +19,27 @@ linux,part-probe = "bcm63xxpart"; - cfe@0 { - label = "CFE"; - reg = <0x000000 0x010000>; - read-only; - }; - - linux@10000 { - label = "linux"; - reg = <0x010000 0x3e0000>; - }; - - nvram@3f0000 { - label = "nvram"; - reg = <0x3f0000 0x010000>; + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + cfe@0 { + label = "CFE"; + reg = <0x000000 0x010000>; + read-only; + }; + + linux@10000 { + label = "linux"; + reg = <0x010000 0x3e0000>; + compatible = "brcm,bcm963xx-imagetag"; + }; + + nvram@3f0000 { + label = "nvram"; + reg = <0x3f0000 0x010000>; + }; }; }; diff --git a/target/linux/brcm63xx/dts/fast2504n.dts b/target/linux/brcm63xx/dts/fast2504n.dts index 8b644fb8f1fd..bb0d98c31444 100644 --- a/target/linux/brcm63xx/dts/fast2504n.dts +++ b/target/linux/brcm63xx/dts/fast2504n.dts @@ -78,20 +78,27 @@ linux,part-probe = "bcm63xxpart"; - cfe@0 { - reg = <0x000000 0x010000>; - label = "cfe"; - read-only; - }; - - linux@10000 { - reg = <0x010000 0x7e0000>; - label = "linux"; - }; - - nvram@7f0000 { - reg = <0x7f0000 0x010000>; - label = "nvram"; + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + cfe@0 { + reg = <0x000000 0x010000>; + label = "cfe"; + read-only; + }; + + linux@10000 { + reg = <0x010000 0x7e0000>; + label = "linux"; + compatible = "brcm,bcm963xx-imagetag"; + }; + + nvram@7f0000 { + reg = <0x7f0000 0x010000>; + label = "nvram"; + }; }; }; }; diff --git a/target/linux/brcm63xx/dts/fast2604.dts b/target/linux/brcm63xx/dts/fast2604.dts index 14339408bc26..5515504fb95d 100644 --- a/target/linux/brcm63xx/dts/fast2604.dts +++ b/target/linux/brcm63xx/dts/fast2604.dts @@ -55,20 +55,27 @@ linux,part-probe = "bcm63xxpart"; - cfe@0 { - label = "CFE"; - reg = <0x000000 0x010000>; - read-only; - }; + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; - linux@10000 { - label = "linux"; - reg = <0x010000 0x3e0000>; - }; + cfe@0 { + label = "CFE"; + reg = <0x000000 0x010000>; + read-only; + }; - nvram@3f0000 { - label = "nvram"; - reg = <0x3f0000 0x010000>; + linux@10000 { + label = "linux"; + reg = <0x010000 0x3e0000>; + compatible = "brcm,bcm963xx-imagetag"; + }; + + nvram@3f0000 { + label = "nvram"; + reg = <0x3f0000 0x010000>; + }; }; }; diff --git a/target/linux/brcm63xx/dts/fast2704n.dts b/target/linux/brcm63xx/dts/fast2704n.dts index 217ef12d7cbd..079f15994993 100644 --- a/target/linux/brcm63xx/dts/fast2704n.dts +++ b/target/linux/brcm63xx/dts/fast2704n.dts @@ -103,20 +103,27 @@ linux,part-probe = "bcm63xxpart"; - cfe@0 { - reg = <0x000000 0x010000>; - label = "cfe"; - read-only; - }; - - linux@10000 { - reg = <0x010000 0x7e0000>; - label = "linux"; - }; - - nvram@7f0000 { - reg = <0x7f0000 0x010000>; - label = "nvram"; + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + cfe@0 { + reg = <0x000000 0x010000>; + label = "cfe"; + read-only; + }; + + linux@10000 { + reg = <0x010000 0x7e0000>; + label = "linux"; + compatible = "brcm,bcm963xx-imagetag"; + }; + + nvram@7f0000 { + reg = <0x7f0000 0x010000>; + label = "nvram"; + }; }; }; }; diff --git a/target/linux/brcm63xx/dts/fast2704v2.dts b/target/linux/brcm63xx/dts/fast2704v2.dts index eeed6b1dae79..8cb1c05d4092 100644 --- a/target/linux/brcm63xx/dts/fast2704v2.dts +++ b/target/linux/brcm63xx/dts/fast2704v2.dts @@ -87,20 +87,27 @@ linux,part-probe = "bcm63xxpart"; - cfe@0 { - reg = <0x000000 0x010000>; - label = "cfe"; - read-only; - }; - - linux@10000 { - reg = <0x010000 0x7e0000>; - label = "linux"; - }; - - nvram@7f0000 { - reg = <0x7f0000 0x010000>; - label = "nvram"; + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + cfe@0 { + reg = <0x000000 0x010000>; + label = "cfe"; + read-only; + }; + + linux@10000 { + reg = <0x010000 0x7e0000>; + label = "linux"; + compatible = "brcm,bcm963xx-imagetag"; + }; + + nvram@7f0000 { + reg = <0x7f0000 0x010000>; + label = "nvram"; + }; }; }; }; diff --git a/target/linux/brcm63xx/dts/gw6000.dts b/target/linux/brcm63xx/dts/gw6000.dts index 31555b3ad2f8..ea7deaaa1277 100644 --- a/target/linux/brcm63xx/dts/gw6000.dts +++ b/target/linux/brcm63xx/dts/gw6000.dts @@ -33,20 +33,27 @@ linux,part-probe = "bcm63xxpart"; - cfe@0 { - label = "CFE"; - reg = <0x000000 0x010000>; - read-only; - }; + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; - linux@10000 { - label = "linux"; - reg = <0x010000 0x3e0000>; - }; + cfe@0 { + label = "CFE"; + reg = <0x000000 0x010000>; + read-only; + }; - nvram@3f0000 { - label = "nvram"; - reg = <0x3f0000 0x010000>; + linux@10000 { + label = "linux"; + reg = <0x010000 0x3e0000>; + compatible = "brcm,bcm963xx-imagetag"; + }; + + nvram@3f0000 { + label = "nvram"; + reg = <0x3f0000 0x010000>; + }; }; }; diff --git a/target/linux/brcm63xx/dts/gw6200.dts b/target/linux/brcm63xx/dts/gw6200.dts index acc100c74747..e9523d0e82ac 100644 --- a/target/linux/brcm63xx/dts/gw6200.dts +++ b/target/linux/brcm63xx/dts/gw6200.dts @@ -54,20 +54,27 @@ linux,part-probe = "bcm63xxpart"; - cfe@0 { - label = "CFE"; - reg = <0x000000 0x010000>; - read-only; - }; + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; - linux@10000 { - label = "linux"; - reg = <0x010000 0x7e0000>; - }; + cfe@0 { + label = "CFE"; + reg = <0x000000 0x010000>; + read-only; + }; - nvram@7f0000 { - label = "nvram"; - reg = <0x7f0000 0x010000>; + linux@10000 { + label = "linux"; + reg = <0x010000 0x7e0000>; + compatible = "brcm,bcm963xx-imagetag"; + }; + + nvram@7f0000 { + label = "nvram"; + reg = <0x7f0000 0x010000>; + }; }; }; diff --git a/target/linux/brcm63xx/dts/hg520v.dts b/target/linux/brcm63xx/dts/hg520v.dts index bfd30693c098..08312f79d1f3 100644 --- a/target/linux/brcm63xx/dts/hg520v.dts +++ b/target/linux/brcm63xx/dts/hg520v.dts @@ -42,20 +42,27 @@ linux,part-probe = "bcm63xxpart"; - cfe@0 { - label = "CFE"; - reg = <0x000000 0x010000>; - read-only; - }; + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; - linux@10000 { - label = "linux"; - reg = <0x010000 0x3e0000>; - }; + cfe@0 { + label = "CFE"; + reg = <0x000000 0x010000>; + read-only; + }; - nvram@3f0000 { - label = "nvram"; - reg = <0x3f0000 0x010000>; + linux@10000 { + label = "linux"; + reg = <0x010000 0x3e0000>; + compatible = "brcm,bcm963xx-imagetag"; + }; + + nvram@3f0000 { + label = "nvram"; + reg = <0x3f0000 0x010000>; + }; }; }; diff --git a/target/linux/brcm63xx/dts/hg553.dts b/target/linux/brcm63xx/dts/hg553.dts index a459976c4d21..01f230da1eb6 100644 --- a/target/linux/brcm63xx/dts/hg553.dts +++ b/target/linux/brcm63xx/dts/hg553.dts @@ -81,20 +81,27 @@ linux,part-probe = "bcm63xxpart"; - cfe@0 { - label = "CFE"; - reg = <0x000000 0x020000>; - read-only; - }; + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; - linux@20000 { - label = "linux"; - reg = <0x020000 0xfc0000>; - }; + cfe@0 { + label = "CFE"; + reg = <0x000000 0x020000>; + read-only; + }; - nvram@fe0000 { - label = "nvram"; - reg = <0xfe0000 0x020000>; + linux@20000 { + label = "linux"; + reg = <0x020000 0xfc0000>; + compatible = "brcm,bcm963xx-imagetag"; + }; + + nvram@fe0000 { + label = "nvram"; + reg = <0xfe0000 0x020000>; + }; }; }; diff --git a/target/linux/brcm63xx/dts/hg556a-a.dts b/target/linux/brcm63xx/dts/hg556a-a.dts index 906ee611b930..bd12fcfacbf9 100644 --- a/target/linux/brcm63xx/dts/hg556a-a.dts +++ b/target/linux/brcm63xx/dts/hg556a-a.dts @@ -107,26 +107,33 @@ linux,part-probe = "bcm63xxpart"; - cfe@0 { - label = "CFE"; - reg = <0x000000 0x020000>; - read-only; - }; + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; - linux@20000 { - label = "linux"; - reg = <0x020000 0xec0000>; - }; + cfe@0 { + label = "CFE"; + reg = <0x000000 0x020000>; + read-only; + }; - cal_data@ee0000 { - label = "cal_data"; - reg = <0xee0000 0x100000>; - read-only; - }; + linux@20000 { + label = "linux"; + reg = <0x020000 0xec0000>; + compatible = "brcm,bcm963xx-imagetag"; + }; + + cal_data@ee0000 { + label = "cal_data"; + reg = <0xee0000 0x100000>; + read-only; + }; - nvram@fe0000 { - label = "nvram"; - reg = <0xfe0000 0x020000>; + nvram@fe0000 { + label = "nvram"; + reg = <0xfe0000 0x020000>; + }; }; }; diff --git a/target/linux/brcm63xx/dts/hg556a-b.dts b/target/linux/brcm63xx/dts/hg556a-b.dts index 4285e17bcb1e..e4dc24d6d786 100644 --- a/target/linux/brcm63xx/dts/hg556a-b.dts +++ b/target/linux/brcm63xx/dts/hg556a-b.dts @@ -107,26 +107,33 @@ linux,part-probe = "bcm63xxpart"; - cfe@0 { - label = "CFE"; - reg = <0x000000 0x020000>; - read-only; - }; + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; - linux@20000 { - label = "linux"; - reg = <0x020000 0xec0000>; - }; + cfe@0 { + label = "CFE"; + reg = <0x000000 0x020000>; + read-only; + }; - cal_data@ee0000 { - label = "cal_data"; - reg = <0xee0000 0x100000>; - read-only; - }; + linux@20000 { + label = "linux"; + reg = <0x020000 0xec0000>; + compatible = "brcm,bcm963xx-imagetag"; + }; + + cal_data@ee0000 { + label = "cal_data"; + reg = <0xee0000 0x100000>; + read-only; + }; - nvram@fe0000 { - label = "nvram"; - reg = <0xfe0000 0x020000>; + nvram@fe0000 { + label = "nvram"; + reg = <0xfe0000 0x020000>; + }; }; }; diff --git a/target/linux/brcm63xx/dts/hg556a-c.dts b/target/linux/brcm63xx/dts/hg556a-c.dts index 48c601e12809..a8c5e9e271fb 100644 --- a/target/linux/brcm63xx/dts/hg556a-c.dts +++ b/target/linux/brcm63xx/dts/hg556a-c.dts @@ -102,26 +102,33 @@ linux,part-probe = "bcm63xxpart"; - cfe@0 { - label = "CFE"; - reg = <0x000000 0x020000>; - read-only; - }; + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; - linux@20000 { - label = "linux"; - reg = <0x020000 0xec0000>; - }; + cfe@0 { + label = "CFE"; + reg = <0x000000 0x020000>; + read-only; + }; - cal_data@ee0000 { - label = "cal_data"; - reg = <0xee0000 0x100000>; - read-only; - }; + linux@20000 { + label = "linux"; + reg = <0x020000 0xec0000>; + compatible = "brcm,bcm963xx-imagetag"; + }; + + cal_data@ee0000 { + label = "cal_data"; + reg = <0xee0000 0x100000>; + read-only; + }; - nvram@fe0000 { - label = "nvram"; - reg = <0xfe0000 0x020000>; + nvram@fe0000 { + label = "nvram"; + reg = <0xfe0000 0x020000>; + }; }; }; diff --git a/target/linux/brcm63xx/dts/hg622.dts b/target/linux/brcm63xx/dts/hg622.dts index 419439d02786..30a80618e868 100644 --- a/target/linux/brcm63xx/dts/hg622.dts +++ b/target/linux/brcm63xx/dts/hg622.dts @@ -56,26 +56,33 @@ linux,part-probe = "bcm63xxpart"; - cfe@0 { - label = "CFE"; - reg = <0x000000 0x020000>; - read-only; - }; + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; - linux@20000 { - label = "linux"; - reg = <0x020000 0xf80000>; - }; + cfe@0 { + label = "CFE"; + reg = <0x000000 0x020000>; + read-only; + }; - cal_data@fa0000 { - label = "cal_data"; - reg = <0xfa0000 0x020000>; - read-only; - }; + linux@20000 { + label = "linux"; + reg = <0x020000 0xf80000>; + compatible = "brcm,bcm963xx-imagetag"; + }; + + cal_data@fa0000 { + label = "cal_data"; + reg = <0xfa0000 0x020000>; + read-only; + }; - nvram@fe0000 { - label = "nvram"; - reg = <0xfe0000 0x020000>; + nvram@fe0000 { + label = "nvram"; + reg = <0xfe0000 0x020000>; + }; }; }; diff --git a/target/linux/brcm63xx/dts/hg655b.dts b/target/linux/brcm63xx/dts/hg655b.dts index 0336a633e44d..fbdf984423f7 100644 --- a/target/linux/brcm63xx/dts/hg655b.dts +++ b/target/linux/brcm63xx/dts/hg655b.dts @@ -74,30 +74,37 @@ linux,part-probe = "bcm63xxpart"; - cfe@0 { - label = "CFE"; - reg = <0x000000 0x020000>; - }; + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; - linux@20000 { - label = "linux"; - reg = <0x020000 0x770000>; - }; + cfe@0 { + label = "CFE"; + reg = <0x000000 0x020000>; + }; - board_data@790000 { - label = "board_data"; - reg = <0x790000 0x030000>; - }; + linux@20000 { + label = "linux"; + reg = <0x020000 0x770000>; + }; - cal_data@7c0000 { - label = "cal_data"; - reg = <0x7c0000 0x020000>; - read-only; - }; + board_data@790000 { + label = "board_data"; + reg = <0x790000 0x030000>; + compatible = "brcm,bcm963xx-imagetag"; + }; - nvram@7d0000 { - label = "nvram"; - reg = <0x7e0000 0x020000>; + cal_data@7c0000 { + label = "cal_data"; + reg = <0x7c0000 0x020000>; + read-only; + }; + + nvram@7d0000 { + label = "nvram"; + reg = <0x7e0000 0x020000>; + }; }; }; diff --git a/target/linux/brcm63xx/dts/homehub2a.dts b/target/linux/brcm63xx/dts/homehub2a.dts index 1f55265bccdd..b3cc23ea0b42 100644 --- a/target/linux/brcm63xx/dts/homehub2a.dts +++ b/target/linux/brcm63xx/dts/homehub2a.dts @@ -141,19 +141,26 @@ linux,part-probe = "bcm63xxpart"; - cfe@0 { - label = "CFE"; - reg = <0x000000 0x020000>; - }; + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; - linux@20000 { - label = "linux"; - reg = <0x020000 0xfc0000>; - }; + cfe@0 { + label = "CFE"; + reg = <0x000000 0x020000>; + }; - nvram@fe0000 { - label = "nvram"; - reg = <0xfe0000 0x020000>; + linux@20000 { + label = "linux"; + reg = <0x020000 0xfc0000>; + compatible = "brcm,bcm963xx-imagetag"; + }; + + nvram@fe0000 { + label = "nvram"; + reg = <0xfe0000 0x020000>; + }; }; }; diff --git a/target/linux/brcm63xx/dts/magic.dts b/target/linux/brcm63xx/dts/magic.dts index c78b836dff3c..65fdb4ed80e0 100644 --- a/target/linux/brcm63xx/dts/magic.dts +++ b/target/linux/brcm63xx/dts/magic.dts @@ -59,20 +59,27 @@ linux,part-probe = "bcm63xxpart"; - cfe@0 { - label = "CFE"; - reg = <0x000000 0x010000>; - read-only; - }; + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + cfe@0 { + label = "CFE"; + reg = <0x000000 0x010000>; + read-only; + }; - linux@10000 { - label = "linux"; - reg = <0x010000 0x3e0000>; - }; + linux@10000 { + label = "linux"; + reg = <0x010000 0x3e0000>; + compatible = "brcm,bcm963xx-imagetag"; + }; - nvram@3f0000 { - label = "nvram"; - reg = <0x3f0000 0x010000>; + nvram@3f0000 { + label = "nvram"; + reg = <0x3f0000 0x010000>; + }; }; }; diff --git a/target/linux/brcm63xx/dts/nb4-fxc-r1.dts b/target/linux/brcm63xx/dts/nb4-fxc-r1.dts index 9d341ec1a235..eba4b206fe09 100644 --- a/target/linux/brcm63xx/dts/nb4-fxc-r1.dts +++ b/target/linux/brcm63xx/dts/nb4-fxc-r1.dts @@ -103,6 +103,10 @@ status = "ok"; linux,part-probe = "bcm63xxpart"; + + partitions { + compatible = "brcm,bcm963xx-cfe-nor-partitions"; + }; }; &uart0 { diff --git a/target/linux/brcm63xx/dts/nb4-ser-r0.dts b/target/linux/brcm63xx/dts/nb4-ser-r0.dts index e97d9f219df4..ac36bd3bb16a 100644 --- a/target/linux/brcm63xx/dts/nb4-ser-r0.dts +++ b/target/linux/brcm63xx/dts/nb4-ser-r0.dts @@ -103,6 +103,10 @@ status = "ok"; linux,part-probe = "bcm63xxpart"; + + partitions { + compatible = "brcm,bcm963xx-cfe-nor-partitions"; + }; }; &uart0 { diff --git a/target/linux/brcm63xx/dts/nb6-ser-r0.dts b/target/linux/brcm63xx/dts/nb6-ser-r0.dts index 70d719e1e3a4..199aa6d6ef99 100644 --- a/target/linux/brcm63xx/dts/nb6-ser-r0.dts +++ b/target/linux/brcm63xx/dts/nb6-ser-r0.dts @@ -66,20 +66,27 @@ linux,part-probe = "bcm63xxpart"; - cfe@0 { - reg = <0x000000 0x010000>; - label = "cfe"; - read-only; - }; - - linux@10000 { - reg = <0x010000 0xfe0000>; - label = "linux"; - }; - - nvram@ff0000 { - reg = <0xff0000 0x010000>; - label = "nvram"; + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + cfe@0 { + reg = <0x000000 0x010000>; + label = "cfe"; + read-only; + }; + + linux@10000 { + reg = <0x010000 0xfe0000>; + label = "linux"; + compatible = "brcm,bcm963xx-imagetag"; + }; + + nvram@ff0000 { + reg = <0xff0000 0x010000>; + label = "nvram"; + }; }; }; }; diff --git a/target/linux/brcm63xx/dts/p870hw-51a-v2.dts b/target/linux/brcm63xx/dts/p870hw-51a-v2.dts index d7e5d3e3f6de..62e1acaed8c0 100644 --- a/target/linux/brcm63xx/dts/p870hw-51a-v2.dts +++ b/target/linux/brcm63xx/dts/p870hw-51a-v2.dts @@ -64,20 +64,27 @@ linux,part-probe = "bcm63xxpart"; - cfe@0 { - label = "CFE"; - reg = <0x000000 0x010000>; - read-only; - }; + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; - linux@10000 { - label = "linux"; - reg = <0x010000 0x3e0000>; - }; + cfe@0 { + label = "CFE"; + reg = <0x000000 0x010000>; + read-only; + }; - nvram@3f0000 { - label = "nvram"; - reg = <0x3f0000 0x010000>; + linux@10000 { + label = "linux"; + reg = <0x010000 0x3e0000>; + compatible = "brcm,bcm963xx-imagetag"; + }; + + nvram@3f0000 { + label = "nvram"; + reg = <0x3f0000 0x010000>; + }; }; }; diff --git a/target/linux/brcm63xx/dts/r1000h.dts b/target/linux/brcm63xx/dts/r1000h.dts index 299b520a672a..5f773bd29a9f 100644 --- a/target/linux/brcm63xx/dts/r1000h.dts +++ b/target/linux/brcm63xx/dts/r1000h.dts @@ -79,17 +79,24 @@ linux,part-probe = "bcm63xxpart"; - CFE@0 { - reg = <0x000000 0x020000>; - read-only; - }; + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; - linux@20000 { - reg = <0x020000 0x1fc0000>; - }; + CFE@0 { + reg = <0x000000 0x020000>; + read-only; + }; - nvram@1fe0000 { - reg = <0x1fe0000 0x20000>; + linux@20000 { + reg = <0x020000 0x1fc0000>; + compatible = "brcm,bcm963xx-imagetag"; + }; + + nvram@1fe0000 { + reg = <0x1fe0000 0x20000>; + }; }; }; diff --git a/target/linux/brcm63xx/dts/r5010unv2.dts b/target/linux/brcm63xx/dts/r5010unv2.dts index c0b0a85c4700..221b4213e652 100644 --- a/target/linux/brcm63xx/dts/r5010unv2.dts +++ b/target/linux/brcm63xx/dts/r5010unv2.dts @@ -83,20 +83,27 @@ linux,part-probe = "bcm63xxpart"; - cfe@0 { - reg = <0x000000 0x010000>; - label = "cfe"; - read-only; - }; - - linux@10000 { - reg = <0x010000 0x7e0000>; - label = "linux"; - }; + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; - nvram@7f0000 { - reg = <0x7f0000 0x010000>; - label = "nvram"; + cfe@0 { + reg = <0x000000 0x010000>; + label = "cfe"; + read-only; + }; + + linux@10000 { + reg = <0x010000 0x7e0000>; + label = "linux"; + compatible = "brcm,bcm963xx-imagetag"; + }; + + nvram@7f0000 { + reg = <0x7f0000 0x010000>; + label = "nvram"; + }; }; }; }; diff --git a/target/linux/brcm63xx/dts/rg100a.dts b/target/linux/brcm63xx/dts/rg100a.dts index 871aada25297..3a46a3e309a1 100644 --- a/target/linux/brcm63xx/dts/rg100a.dts +++ b/target/linux/brcm63xx/dts/rg100a.dts @@ -41,20 +41,27 @@ linux,part-probe = "bcm63xxpart"; - cfe@0 { - label = "CFE"; - reg = <0x000000 0x020000>; - read-only; - }; + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; - linux@20000 { - label = "linux"; - reg = <0x020000 0xfc0000>; - }; + cfe@0 { + label = "CFE"; + reg = <0x000000 0x020000>; + read-only; + }; - nvram@fe0000 { - label = "nvram"; - reg = <0xfe0000 0x020000>; + linux@20000 { + label = "linux"; + reg = <0x020000 0xfc0000>; + compatible = "brcm,bcm963xx-imagetag"; + }; + + nvram@fe0000 { + label = "nvram"; + reg = <0xfe0000 0x020000>; + }; }; }; diff --git a/target/linux/brcm63xx/dts/rta1025w.dts b/target/linux/brcm63xx/dts/rta1025w.dts index e4de95dbe435..d7c2bf886413 100644 --- a/target/linux/brcm63xx/dts/rta1025w.dts +++ b/target/linux/brcm63xx/dts/rta1025w.dts @@ -19,20 +19,27 @@ linux,part-probe = "bcm63xxpart"; - cfe@0 { - label = "CFE"; - reg = <0x000000 0x010000>; - read-only; - }; - - linux@10000 { - label = "linux"; - reg = <0x010000 0x3e0000>; - }; - - nvram@3f0000 { - label = "nvram"; - reg = <0x3f0000 0x010000>; + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + cfe@0 { + label = "CFE"; + reg = <0x000000 0x010000>; + read-only; + }; + + linux@10000 { + label = "linux"; + reg = <0x010000 0x3e0000>; + compatible = "brcm,bcm963xx-imagetag"; + }; + + nvram@3f0000 { + label = "nvram"; + reg = <0x3f0000 0x010000>; + }; }; }; diff --git a/target/linux/brcm63xx/dts/rta1320.dts b/target/linux/brcm63xx/dts/rta1320.dts index aedc9d30f6c7..bec477c33e57 100644 --- a/target/linux/brcm63xx/dts/rta1320.dts +++ b/target/linux/brcm63xx/dts/rta1320.dts @@ -41,20 +41,27 @@ linux,part-probe = "bcm63xxpart"; - cfe@0 { - label = "CFE"; - reg = <0x000000 0x010000>; - read-only; - }; + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; - linux@10000 { - label = "linux"; - reg = <0x010000 0x3e0000>; - }; + cfe@0 { + label = "CFE"; + reg = <0x000000 0x010000>; + read-only; + }; - nvram@3f0000 { - label = "nvram"; - reg = <0x3f0000 0x010000>; + linux@10000 { + label = "linux"; + reg = <0x010000 0x3e0000>; + compatible = "brcm,bcm963xx-imagetag"; + }; + + nvram@3f0000 { + label = "nvram"; + reg = <0x3f0000 0x010000>; + }; }; }; diff --git a/target/linux/brcm63xx/dts/rta770bw.dts b/target/linux/brcm63xx/dts/rta770bw.dts index 0f71467589a8..767ff36d0c80 100644 --- a/target/linux/brcm63xx/dts/rta770bw.dts +++ b/target/linux/brcm63xx/dts/rta770bw.dts @@ -57,20 +57,27 @@ linux,part-probe = "bcm63xxpart"; - cfe@0 { - label = "CFE"; - reg = <0x000000 0x010000>; - read-only; - }; + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; - linux@10000 { - label = "linux"; - reg = <0x010000 0x3e0000>; - }; + cfe@0 { + label = "CFE"; + reg = <0x000000 0x010000>; + read-only; + }; - nvram@3f0000 { - label = "nvram"; - reg = <0x3f0000 0x010000>; + linux@10000 { + label = "linux"; + reg = <0x010000 0x3e0000>; + compatible = "brcm,bcm963xx-imagetag"; + }; + + nvram@3f0000 { + label = "nvram"; + reg = <0x3f0000 0x010000>; + }; }; }; diff --git a/target/linux/brcm63xx/dts/rta770w.dts b/target/linux/brcm63xx/dts/rta770w.dts index ce9f0be37746..93cf9ffe5947 100644 --- a/target/linux/brcm63xx/dts/rta770w.dts +++ b/target/linux/brcm63xx/dts/rta770w.dts @@ -57,20 +57,27 @@ linux,part-probe = "bcm63xxpart"; - cfe@0 { - label = "CFE"; - reg = <0x000000 0x010000>; - read-only; - }; + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; - linux@10000 { - label = "linux"; - reg = <0x010000 0x3e0000>; - }; + cfe@0 { + label = "CFE"; + reg = <0x000000 0x010000>; + read-only; + }; - nvram@3f0000 { - label = "nvram"; - reg = <0x3f0000 0x010000>; + linux@10000 { + label = "linux"; + reg = <0x010000 0x3e0000>; + compatible = "brcm,bcm963xx-imagetag"; + }; + + nvram@3f0000 { + label = "nvram"; + reg = <0x3f0000 0x010000>; + }; }; }; diff --git a/target/linux/brcm63xx/dts/spw303v.dts b/target/linux/brcm63xx/dts/spw303v.dts index 7a0002023f0a..e7113df6dc21 100644 --- a/target/linux/brcm63xx/dts/spw303v.dts +++ b/target/linux/brcm63xx/dts/spw303v.dts @@ -68,20 +68,27 @@ linux,part-probe = "bcm63xxpart"; - cfe@0 { - label = "CFE"; - reg = <0x000000 0x010000>; - read-only; - }; + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; - linux@10000 { - label = "linux"; - reg = <0x010000 0x7e0000>; - }; + cfe@0 { + label = "CFE"; + reg = <0x000000 0x010000>; + read-only; + }; - nvram@7f0000 { - label = "nvram"; - reg = <0x7f0000 0x010000>; + linux@10000 { + label = "linux"; + reg = <0x010000 0x7e0000>; + compatible = "brcm,bcm963xx-imagetag"; + }; + + nvram@7f0000 { + label = "nvram"; + reg = <0x7f0000 0x010000>; + }; }; }; diff --git a/target/linux/brcm63xx/dts/spw500v.dts b/target/linux/brcm63xx/dts/spw500v.dts index c7a4c7dfd294..af9c6966d3d8 100644 --- a/target/linux/brcm63xx/dts/spw500v.dts +++ b/target/linux/brcm63xx/dts/spw500v.dts @@ -59,20 +59,27 @@ linux,part-probe = "bcm63xxpart"; - cfe@0 { - label = "CFE"; - reg = <0x000000 0x010000>; - read-only; - }; + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; - linux@10000 { - label = "linux"; - reg = <0x010000 0x3e0000>; - }; + cfe@0 { + label = "CFE"; + reg = <0x000000 0x010000>; + read-only; + }; - nvram@3f0000 { - label = "nvram"; - reg = <0x3f0000 0x010000>; + linux@10000 { + label = "linux"; + reg = <0x010000 0x3e0000>; + compatible = "brcm,bcm963xx-imagetag"; + }; + + nvram@3f0000 { + label = "nvram"; + reg = <0x3f0000 0x010000>; + }; }; }; diff --git a/target/linux/brcm63xx/dts/td-w8900gb.dts b/target/linux/brcm63xx/dts/td-w8900gb.dts index e5c02e63aec7..e90cd706f7c4 100644 --- a/target/linux/brcm63xx/dts/td-w8900gb.dts +++ b/target/linux/brcm63xx/dts/td-w8900gb.dts @@ -59,20 +59,27 @@ linux,part-probe = "bcm63xxpart"; - cfe@0 { - label = "CFE"; - reg = <0x000000 0x020000>; - read-only; - }; + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; - linux@20000 { - label = "linux"; - reg = <0x020000 0x3d0000>; - }; + cfe@0 { + label = "CFE"; + reg = <0x000000 0x020000>; + read-only; + }; - nvram@3e0000 { - label = "nvram"; - reg = <0x3f0000 0x010000>; + linux@20000 { + label = "linux"; + reg = <0x020000 0x3d0000>; + compatible = "brcm,bcm963xx-imagetag"; + }; + + nvram@3e0000 { + label = "nvram"; + reg = <0x3f0000 0x010000>; + }; }; }; diff --git a/target/linux/brcm63xx/dts/usr9108.dts b/target/linux/brcm63xx/dts/usr9108.dts index 4852d65ad34e..d2cb81e0dd6e 100644 --- a/target/linux/brcm63xx/dts/usr9108.dts +++ b/target/linux/brcm63xx/dts/usr9108.dts @@ -32,20 +32,27 @@ linux,part-probe = "bcm63xxpart"; - cfe@0 { - label = "CFE"; - reg = <0x000000 0x010000>; - read-only; - }; + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; - linux@10000 { - label = "linux"; - reg = <0x010000 0x3e0000>; - }; + cfe@0 { + label = "CFE"; + reg = <0x000000 0x010000>; + read-only; + }; - nvram@3f0000 { - label = "nvram"; - reg = <0x3f0000 0x010000>; + linux@10000 { + label = "linux"; + reg = <0x010000 0x3e0000>; + compatible = "brcm,bcm963xx-imagetag"; + }; + + nvram@3f0000 { + label = "nvram"; + reg = <0x3f0000 0x010000>; + }; }; }; diff --git a/target/linux/brcm63xx/dts/v2110.dts b/target/linux/brcm63xx/dts/v2110.dts index 93a5d9443686..b5a7f9ecbf32 100644 --- a/target/linux/brcm63xx/dts/v2110.dts +++ b/target/linux/brcm63xx/dts/v2110.dts @@ -58,20 +58,27 @@ linux,part-probe = "bcm63xxpart"; - cfe@0 { - label = "CFE"; - reg = <0x000000 0x010000>; - read-only; - }; + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; - linux@10000 { - label = "linux"; - reg = <0x010000 0x3e0000>; - }; + cfe@0 { + label = "CFE"; + reg = <0x000000 0x010000>; + read-only; + }; - nvram@3f0000 { - label = "nvram"; - reg = <0x3f0000 0x010000>; + linux@10000 { + label = "linux"; + reg = <0x010000 0x3e0000>; + compatible = "brcm,bcm963xx-imagetag"; + }; + + nvram@3f0000 { + label = "nvram"; + reg = <0x3f0000 0x010000>; + }; }; }; diff --git a/target/linux/brcm63xx/dts/v2500v-bb.dts b/target/linux/brcm63xx/dts/v2500v-bb.dts index d6b5964f8c59..9111e07e03af 100644 --- a/target/linux/brcm63xx/dts/v2500v-bb.dts +++ b/target/linux/brcm63xx/dts/v2500v-bb.dts @@ -58,20 +58,27 @@ linux,part-probe = "bcm63xxpart"; - cfe@0 { - label = "CFE"; - reg = <0x000000 0x010000>; - read-only; - }; + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; - linux@10000 { - label = "linux"; - reg = <0x010000 0x3e0000>; - }; + cfe@0 { + label = "CFE"; + reg = <0x000000 0x010000>; + read-only; + }; - nvram@3f0000 { - label = "nvram"; - reg = <0x3f0000 0x010000>; + linux@10000 { + label = "linux"; + reg = <0x010000 0x3e0000>; + compatible = "brcm,bcm963xx-imagetag"; + }; + + nvram@3f0000 { + label = "nvram"; + reg = <0x3f0000 0x010000>; + }; }; }; diff --git a/target/linux/brcm63xx/dts/vg50.dts b/target/linux/brcm63xx/dts/vg50.dts index f1d48ea3c194..9f559f208f11 100644 --- a/target/linux/brcm63xx/dts/vg50.dts +++ b/target/linux/brcm63xx/dts/vg50.dts @@ -48,6 +48,10 @@ #size-cells = <1>; linux,part-probe = "bcm63xxpart"; + + partitions { + compatible = "brcm,bcm963xx-cfe-nor-partitions"; + }; }; }; diff --git a/target/linux/brcm63xx/dts/vh4032n.dts b/target/linux/brcm63xx/dts/vh4032n.dts index 78a708ac06bb..6c5a3d4b791a 100644 --- a/target/linux/brcm63xx/dts/vh4032n.dts +++ b/target/linux/brcm63xx/dts/vh4032n.dts @@ -85,20 +85,27 @@ linux,part-probe = "bcm63xxpart"; - cfe@0 { - label = "CFE"; - reg = <0x0000000 0x0020000>; - read-only; - }; + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; - linux@20000 { - label = "linux"; - reg = <0x0020000 0x1fc0000>; - }; + cfe@0 { + label = "CFE"; + reg = <0x0000000 0x0020000>; + read-only; + }; - nvram@1fe0000 { - label = "nvram"; - reg = <0x1fe0000 0x020000>; + linux@20000 { + label = "linux"; + reg = <0x0020000 0x1fc0000>; + compatible = "brcm,bcm963xx-imagetag"; + }; + + nvram@1fe0000 { + label = "nvram"; + reg = <0x1fe0000 0x020000>; + }; }; }; diff --git a/target/linux/brcm63xx/dts/vr-3025u.dts b/target/linux/brcm63xx/dts/vr-3025u.dts index fd2a56769340..40f64b057d53 100644 --- a/target/linux/brcm63xx/dts/vr-3025u.dts +++ b/target/linux/brcm63xx/dts/vr-3025u.dts @@ -59,20 +59,27 @@ linux,part-probe = "bcm63xxpart"; - cfe@0 { - label = "CFE"; - reg = <0x0000000 0x0020000>; - read-only; - }; + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; - linux@20000 { - label = "linux"; - reg = <0x0020000 0x1fc0000>; - }; + cfe@0 { + label = "CFE"; + reg = <0x0000000 0x0020000>; + read-only; + }; - nvram@1fe0000 { - label = "nvram"; - reg = <0x1fe0000 0x020000>; + linux@20000 { + label = "linux"; + reg = <0x0020000 0x1fc0000>; + compatible = "brcm,bcm963xx-imagetag"; + }; + + nvram@1fe0000 { + label = "nvram"; + reg = <0x1fe0000 0x020000>; + }; }; }; diff --git a/target/linux/brcm63xx/dts/vr-3025un.dts b/target/linux/brcm63xx/dts/vr-3025un.dts index 61e1972519a3..9a3af44c71cf 100644 --- a/target/linux/brcm63xx/dts/vr-3025un.dts +++ b/target/linux/brcm63xx/dts/vr-3025un.dts @@ -59,20 +59,27 @@ linux,part-probe = "bcm63xxpart"; - cfe@0 { - label = "CFE"; - reg = <0x000000 0x010000>; - read-only; - }; + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; - linux@10000 { - label = "linux"; - reg = <0x010000 0x7e0000>; - }; + cfe@0 { + label = "CFE"; + reg = <0x000000 0x010000>; + read-only; + }; - nvram@7f0000 { - label = "nvram"; - reg = <0x7f0000 0x010000>; + linux@10000 { + label = "linux"; + reg = <0x010000 0x7e0000>; + compatible = "brcm,bcm963xx-imagetag"; + }; + + nvram@7f0000 { + label = "nvram"; + reg = <0x7f0000 0x010000>; + }; }; }; diff --git a/target/linux/brcm63xx/dts/vr-3026e.dts b/target/linux/brcm63xx/dts/vr-3026e.dts index 01cb98817a00..7acf52e34b23 100644 --- a/target/linux/brcm63xx/dts/vr-3026e.dts +++ b/target/linux/brcm63xx/dts/vr-3026e.dts @@ -59,20 +59,27 @@ linux,part-probe = "bcm63xxpart"; - cfe@0 { - label = "CFE"; - reg = <0x000000 0x010000>; - read-only; - }; + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; - linux@10000 { - label = "linux"; - reg = <0x010000 0x7e0000>; - }; + cfe@0 { + label = "CFE"; + reg = <0x000000 0x010000>; + read-only; + }; - nvram@7f0000 { - label = "nvram"; - reg = <0x7f0000 0x010000>; + linux@10000 { + label = "linux"; + reg = <0x010000 0x7e0000>; + compatible = "brcm,bcm963xx-imagetag"; + }; + + nvram@7f0000 { + label = "nvram"; + reg = <0x7f0000 0x010000>; + }; }; }; diff --git a/target/linux/brcm63xx/dts/wap-5813n.dts b/target/linux/brcm63xx/dts/wap-5813n.dts index 1a71426cafeb..fa9030d4a2ad 100644 --- a/target/linux/brcm63xx/dts/wap-5813n.dts +++ b/target/linux/brcm63xx/dts/wap-5813n.dts @@ -69,20 +69,27 @@ linux,part-probe = "bcm63xxpart"; - cfe@0 { - label = "CFE"; - reg = <0x000000 0x010000>; - read-only; - }; + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; - linux@10000 { - label = "linux"; - reg = <0x010000 0x7e0000>; - }; + cfe@0 { + label = "CFE"; + reg = <0x000000 0x010000>; + read-only; + }; - nvram@7f0000 { - label = "nvram"; - reg = <0x7f0000 0x010000>; + linux@10000 { + label = "linux"; + reg = <0x010000 0x7e0000>; + compatible = "brcm,bcm963xx-imagetag"; + }; + + nvram@7f0000 { + label = "nvram"; + reg = <0x7f0000 0x010000>; + }; }; };