| Message ID | 1438938599-11252-1-git-send-email-matthias.klein@optimeas.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hello Matthias, Am Freitag, den 07.08.2015, 11:09 +0200 schrieb Matthias Klein: > Partitions which are defined in the som file can not be deleted in the > board file. > > Signed-off-by: Matthias Klein <matthias.klein@optimeas.de> > --- > arch/arm/boot/dts/am335x-phycore-som.dtsi | 37 ------------------------- > arch/arm/boot/dts/am335x-wega.dtsi | 45 +++++++++++++++++++++++++++++++ > 2 files changed, 45 insertions(+), 37 deletions(-) > > diff --git a/arch/arm/boot/dts/am335x-phycore-som.dtsi b/arch/arm/boot/dts/am335x-phycore-som.dtsi > index 4d28fc3..8f12bd54 100644 > --- a/arch/arm/boot/dts/am335x-phycore-som.dtsi > +++ b/arch/arm/boot/dts/am335x-phycore-som.dtsi > @@ -189,43 +189,6 @@ > > #address-cells = <1>; > #size-cells = <1>; > - > - partition@0 { > - label = "xload"; > - reg = <0x0 0x20000>; > - }; > - partition@1 { > - label = "xload_backup1"; > - reg = <0x20000 0x20000>; > - }; > - partition@2 { > - label = "xload_backup2"; > - reg = <0x40000 0x20000>; > - }; > - partition@3 { > - label = "xload_backup3"; > - reg = <0x60000 0x20000>; > - }; > - partition@4 { > - label = "barebox"; > - reg = <0x80000 0x80000>; > - }; > - partition@5 { > - label = "bareboxenv"; > - reg = <0x100000 0x40000>; > - }; > - partition@6 { > - label = "oftree"; > - reg = <0x140000 0x40000>; > - }; > - partition@7 { > - label = "kernel"; > - reg = <0x180000 0x800000>; > - }; > - partition@8 { > - label = "root"; > - reg = <0x980000 0x0>; > - }; > }; > }; > > diff --git a/arch/arm/boot/dts/am335x-wega.dtsi b/arch/arm/boot/dts/am335x-wega.dtsi > index 5e541bd..945a41d 100644 > --- a/arch/arm/boot/dts/am335x-wega.dtsi > +++ b/arch/arm/boot/dts/am335x-wega.dtsi > @@ -149,3 +149,48 @@ > &usb1_phy { > status = "okay"; > }; I don't think that moving the nand partition to the carrier board dtsi is correct. The nand partition does not have anything to do with the carrier board in first place. So they should rather be moved to the am335x-wega-rdk.dts which does describe the board in a whole. If you do this, you should remove the spi partitions from the SoM dtsi also. And it is generally possible to delete nodes from a device tree with /delete-node/ &my_node; But I have actually not tested this when overwriting partitions. Neither know if this whould be a sane solution. Regards Teresa > + > +&nandflash { > + partition@0 { > + label = "xload"; > + reg = <0x0 0x20000>; > + }; > + > + partition@1 { > + label = "xload_backup1"; > + reg = <0x20000 0x20000>; > + }; > + > + partition@2 { > + label = "xload_backup2"; > + reg = <0x40000 0x20000>; > + }; > + > + partition@3 { > + label = "xload_backup3"; > + reg = <0x60000 0x20000>; > + }; > + > + partition@4 { > + label = "barebox"; > + reg = <0x80000 0x80000>; > + }; > + > + partition@5 { > + label = "bareboxenv"; > + reg = <0x100000 0x40000>; > + }; > + > + partition@6 { > + label = "oftree"; > + reg = <0x140000 0x40000>; > + }; > + partition@7 { > + label = "kernel"; > + reg = <0x180000 0x800000>; > + }; > + partition@8 { > + label = "root"; > + reg = <0x980000 0x0>; > + }; > +}; -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/arm/boot/dts/am335x-phycore-som.dtsi b/arch/arm/boot/dts/am335x-phycore-som.dtsi index 4d28fc3..8f12bd54 100644 --- a/arch/arm/boot/dts/am335x-phycore-som.dtsi +++ b/arch/arm/boot/dts/am335x-phycore-som.dtsi @@ -189,43 +189,6 @@ #address-cells = <1>; #size-cells = <1>; - - partition@0 { - label = "xload"; - reg = <0x0 0x20000>; - }; - partition@1 { - label = "xload_backup1"; - reg = <0x20000 0x20000>; - }; - partition@2 { - label = "xload_backup2"; - reg = <0x40000 0x20000>; - }; - partition@3 { - label = "xload_backup3"; - reg = <0x60000 0x20000>; - }; - partition@4 { - label = "barebox"; - reg = <0x80000 0x80000>; - }; - partition@5 { - label = "bareboxenv"; - reg = <0x100000 0x40000>; - }; - partition@6 { - label = "oftree"; - reg = <0x140000 0x40000>; - }; - partition@7 { - label = "kernel"; - reg = <0x180000 0x800000>; - }; - partition@8 { - label = "root"; - reg = <0x980000 0x0>; - }; }; }; diff --git a/arch/arm/boot/dts/am335x-wega.dtsi b/arch/arm/boot/dts/am335x-wega.dtsi index 5e541bd..945a41d 100644 --- a/arch/arm/boot/dts/am335x-wega.dtsi +++ b/arch/arm/boot/dts/am335x-wega.dtsi @@ -149,3 +149,48 @@ &usb1_phy { status = "okay"; }; + +&nandflash { + partition@0 { + label = "xload"; + reg = <0x0 0x20000>; + }; + + partition@1 { + label = "xload_backup1"; + reg = <0x20000 0x20000>; + }; + + partition@2 { + label = "xload_backup2"; + reg = <0x40000 0x20000>; + }; + + partition@3 { + label = "xload_backup3"; + reg = <0x60000 0x20000>; + }; + + partition@4 { + label = "barebox"; + reg = <0x80000 0x80000>; + }; + + partition@5 { + label = "bareboxenv"; + reg = <0x100000 0x40000>; + }; + + partition@6 { + label = "oftree"; + reg = <0x140000 0x40000>; + }; + partition@7 { + label = "kernel"; + reg = <0x180000 0x800000>; + }; + partition@8 { + label = "root"; + reg = <0x980000 0x0>; + }; +};
Partitions which are defined in the som file can not be deleted in the board file. Signed-off-by: Matthias Klein <matthias.klein@optimeas.de> --- arch/arm/boot/dts/am335x-phycore-som.dtsi | 37 ------------------------- arch/arm/boot/dts/am335x-wega.dtsi | 45 +++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 37 deletions(-)