From a27d59bb427466311fe7e69da3f0f53be18237aa Mon Sep 17 00:00:00 2001 From: Jonas Gorski Date: Wed, 28 Jun 2017 10:44:38 +0200 Subject: [PATCH] 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 --- target/linux/brcm63xx/dts/a226g.dts | 31 +++++++----- target/linux/brcm63xx/dts/a226m-fwb.dts | 31 +++++++----- target/linux/brcm63xx/dts/a226m.dts | 31 +++++++----- target/linux/brcm63xx/dts/a4001n.dts | 38 ++++++++------- target/linux/brcm63xx/dts/a4001n1.dts | 35 ++++++++------ target/linux/brcm63xx/dts/ad1018-nor.dts | 4 ++ target/linux/brcm63xx/dts/agpf-s0.dts | 31 +++++++----- target/linux/brcm63xx/dts/ar-5315u.dts | 34 +++++++++----- target/linux/brcm63xx/dts/ar-5381u.dts | 35 ++++++++------ target/linux/brcm63xx/dts/ar-5387un.dts | 35 ++++++++------ target/linux/brcm63xx/dts/ar1004g.dts | 31 +++++++----- target/linux/brcm63xx/dts/av4202n.dts | 31 +++++++----- target/linux/brcm63xx/dts/bcm96318ref.dts | 4 ++ .../linux/brcm63xx/dts/bcm96318ref_p300.dts | 4 ++ .../linux/brcm63xx/dts/bcm963268bu_p300.dts | 4 ++ target/linux/brcm63xx/dts/bcm963269bhr.dts | 4 ++ target/linux/brcm63xx/dts/bcm963281TAN.dts | 4 ++ target/linux/brcm63xx/dts/bcm96328avng.dts | 4 ++ target/linux/brcm63xx/dts/bcm96338GW.dts | 4 ++ target/linux/brcm63xx/dts/bcm96338W.dts | 4 ++ target/linux/brcm63xx/dts/bcm96345GW2.dts | 4 ++ target/linux/brcm63xx/dts/bcm96348GW-10.dts | 4 ++ target/linux/brcm63xx/dts/bcm96348GW-11.dts | 4 ++ target/linux/brcm63xx/dts/bcm96348GW.dts | 4 ++ target/linux/brcm63xx/dts/bcm96348R.dts | 4 ++ target/linux/brcm63xx/dts/bcm96358VW.dts | 4 ++ target/linux/brcm63xx/dts/bcm96358VW2.dts | 4 ++ target/linux/brcm63xx/dts/bcm96368MVNgr.dts | 4 ++ target/linux/brcm63xx/dts/bcm96368MVWG.dts | 4 ++ target/linux/brcm63xx/dts/cpva502plus.dts | 31 +++++++----- target/linux/brcm63xx/dts/cpva642.dts | 31 +++++++----- target/linux/brcm63xx/dts/ct-5365.dts | 31 +++++++----- target/linux/brcm63xx/dts/ct-6373.dts | 31 +++++++----- target/linux/brcm63xx/dts/ct536plus.dts | 31 +++++++----- target/linux/brcm63xx/dts/cvg834g.dts | 31 +++++++----- target/linux/brcm63xx/dts/dg834g_v4.dts | 31 +++++++----- target/linux/brcm63xx/dts/dg834gtpn.dts | 31 +++++++----- target/linux/brcm63xx/dts/dgnd3700v1.dts | 41 +++++++++------- target/linux/brcm63xx/dts/dsl-2640b-b.dts | 31 +++++++----- target/linux/brcm63xx/dts/dsl-2640u.dts | 31 +++++++----- target/linux/brcm63xx/dts/dsl-2650u.dts | 31 +++++++----- target/linux/brcm63xx/dts/dsl-274xb-c.dts | 31 +++++++----- target/linux/brcm63xx/dts/dsl-274xb-f.dts | 47 +++++++++++-------- target/linux/brcm63xx/dts/dsl-275xb-d.dts | 35 ++++++++------ target/linux/brcm63xx/dts/dv-201amr.dts | 35 ++++++++------ target/linux/brcm63xx/dts/dva-g3810bn_tl.dts | 31 +++++++----- target/linux/brcm63xx/dts/evg2000.dts | 41 +++++++++------- target/linux/brcm63xx/dts/f5d7633.dts | 31 +++++++----- target/linux/brcm63xx/dts/fast2404.dts | 35 ++++++++------ target/linux/brcm63xx/dts/fast2504n.dts | 35 ++++++++------ target/linux/brcm63xx/dts/fast2604.dts | 31 +++++++----- target/linux/brcm63xx/dts/fast2704n.dts | 35 ++++++++------ target/linux/brcm63xx/dts/fast2704v2.dts | 35 ++++++++------ target/linux/brcm63xx/dts/gw6000.dts | 31 +++++++----- target/linux/brcm63xx/dts/gw6200.dts | 31 +++++++----- target/linux/brcm63xx/dts/hg520v.dts | 31 +++++++----- target/linux/brcm63xx/dts/hg553.dts | 31 +++++++----- target/linux/brcm63xx/dts/hg556a-a.dts | 41 +++++++++------- target/linux/brcm63xx/dts/hg556a-b.dts | 41 +++++++++------- target/linux/brcm63xx/dts/hg556a-c.dts | 41 +++++++++------- target/linux/brcm63xx/dts/hg622.dts | 41 +++++++++------- target/linux/brcm63xx/dts/hg655b.dts | 47 +++++++++++-------- target/linux/brcm63xx/dts/homehub2a.dts | 29 +++++++----- target/linux/brcm63xx/dts/magic.dts | 31 +++++++----- target/linux/brcm63xx/dts/nb4-fxc-r1.dts | 4 ++ target/linux/brcm63xx/dts/nb4-ser-r0.dts | 4 ++ target/linux/brcm63xx/dts/nb6-ser-r0.dts | 35 ++++++++------ target/linux/brcm63xx/dts/p870hw-51a-v2.dts | 31 +++++++----- target/linux/brcm63xx/dts/r1000h.dts | 25 ++++++---- target/linux/brcm63xx/dts/r5010unv2.dts | 33 ++++++++----- target/linux/brcm63xx/dts/rg100a.dts | 31 +++++++----- target/linux/brcm63xx/dts/rta1025w.dts | 35 ++++++++------ target/linux/brcm63xx/dts/rta1320.dts | 31 +++++++----- target/linux/brcm63xx/dts/rta770bw.dts | 31 +++++++----- target/linux/brcm63xx/dts/rta770w.dts | 31 +++++++----- target/linux/brcm63xx/dts/spw303v.dts | 31 +++++++----- target/linux/brcm63xx/dts/spw500v.dts | 31 +++++++----- target/linux/brcm63xx/dts/td-w8900gb.dts | 31 +++++++----- target/linux/brcm63xx/dts/usr9108.dts | 31 +++++++----- target/linux/brcm63xx/dts/v2110.dts | 31 +++++++----- target/linux/brcm63xx/dts/v2500v-bb.dts | 31 +++++++----- target/linux/brcm63xx/dts/vg50.dts | 4 ++ target/linux/brcm63xx/dts/vh4032n.dts | 31 +++++++----- target/linux/brcm63xx/dts/vr-3025u.dts | 31 +++++++----- target/linux/brcm63xx/dts/vr-3025un.dts | 31 +++++++----- target/linux/brcm63xx/dts/vr-3026e.dts | 31 +++++++----- target/linux/brcm63xx/dts/wap-5813n.dts | 31 +++++++----- 87 files changed, 1407 insertions(+), 863 deletions(-) diff --git a/target/linux/brcm63xx/dts/a226g.dts b/target/linux/brcm63xx/dts/a226g.dts index 921e46c796..539f776af8 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 c21d06ec5b..6c88d5378d 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 7c8bdabf71..4918a87013 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 db835434d8..d99da824e5 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 ad1590d7a0..7306e90275 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 7a630a1856..5ce19db335 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 6ac3801c38..140ebfae9f 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 e359fe4ebb..5c5d7c6dd5 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 9da5b7e3cd..c3ed00a5f4 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 4dd71459fc..9b54fda74d 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 e7265f4d4b..600245c63a 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 ef61607882..138d8c0ff1 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 e48c0bf46e..2d19eeaeee 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 db9d5eccd6..fb8ad78512 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 2bccb57a98..2c9875644a 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 d3c709877b..ad31adfdfe 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 d0d19a3550..b280cb0bc1 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 d0d67880e4..24e658e8d2 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 d6ff449d31..741a695af3 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 f91ca9a399..674b3993c9 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 a7b3fad136..e329b01927 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 59850b5a10..742fefd28d 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 3caca09707..30f77d9c08 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 c213ac7a1f..0713cec714 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 b56869b3e4..b15c6ccc0c 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 e097c0518e..ca9238829a 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 5c242c2157..8eebd1c424 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 6c4ef091ac..0b1773d27d 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 ed1dd90160..172abd2cf7 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 6d8455e91c..023970acab 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 212bf6c32a..ba0426ae55 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 ac3b80954f..3598f912cc 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 579b514f93..e6069bcd06 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 f9bc7e136c..9c075a54ce 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 fa14c8bbd9..ad71eb3998 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 369a67c222..019fe49e27 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 794c701dad..694af6ad5b 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 2d23f19b7a..3a556b3562 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 df7f4adc07..0acb5c6e76 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 8fea2acb25..e6d1819257 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 c9b189b8b0..22b1d52417 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 3468dea8b3..bab04271e7 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 00a5a9e99a..8555bb4f2c 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 d8f8c08e1e..c801fcab26 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 42a825f923..c13093228d 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 2945165ce1..3478657f19 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 10e0ddcc93..2d254fb03c 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 89c646b923..621ef0b3e1 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 c0a30a08ea..8fde61621a 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 8b644fb8f1..bb0d98c314 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 14339408bc..5515504fb9 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 217ef12d7c..079f159949 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 eeed6b1dae..8cb1c05d40 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 31555b3ad2..ea7deaaa12 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 acc100c747..e9523d0e82 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 bfd30693c0..08312f79d1 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 a459976c4d..01f230da1e 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 906ee611b9..bd12fcfacb 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 4285e17bcb..e4dc24d6d7 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 48c601e128..a8c5e9e271 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 419439d027..30a80618e8 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 0336a633e4..fbdf984423 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 1f55265bcc..b3cc23ea0b 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 c78b836dff..65fdb4ed80 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 9d341ec1a2..eba4b206fe 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 e97d9f219d..ac36bd3bb1 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 70d719e1e3..199aa6d6ef 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 d7e5d3e3f6..62e1acaed8 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 299b520a67..5f773bd29a 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 c0b0a85c47..221b4213e6 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 871aada252..3a46a3e309 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 e4de95dbe4..d7c2bf8864 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 aedc9d30f6..bec477c33e 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 0f71467589..767ff36d0c 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 ce9f0be377..93cf9ffe59 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 7a0002023f..e7113df6dc 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 c7a4c7dfd2..af9c6966d3 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 e5c02e63ae..e90cd706f7 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 4852d65ad3..d2cb81e0dd 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 93a5d94436..b5a7f9ecbf 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 d6b5964f8c..9111e07e03 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 f1d48ea3c1..9f559f208f 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 78a708ac06..6c5a3d4b79 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 fd2a567693..40f64b057d 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 61e1972519..9a3af44c71 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 01cb98817a..7acf52e34b 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 1a71426caf..fa9030d4a2 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>; + }; }; }; -- 2.25.1