Hi Sebastian, On sam., nov. 28 2015, Sebastian Hesselbarth <sebastian.hesselbarth@xxxxxxxxx> wrote: > NAND flash partitions should be part of a partitions sub-node > not the flash node itself. Move the partitions which will also > allow different bootloaders get rid of the stock partitions > easily by removing the partitions node. > > Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@xxxxxxxxx> Applied on mvebu/dt Thanks, Gregory > --- > Cc: Jason Cooper <jason@xxxxxxxxxxxxxx> > Cc: Andrew Lunn <andrew@xxxxxxx> > Cc: Gregory Clement <gregory.clement@xxxxxxxxxxxxxxxxxx> > Cc: Rob Herring <robh+dt@xxxxxxxxxx> > Cc: Pawel Moll <pawel.moll@xxxxxxx> > Cc: Mark Rutland <mark.rutland@xxxxxxx> > Cc: Ian Campbell <ijc+devicetree@xxxxxxxxxxxxxx> > Cc: Kumar Gala <galak@xxxxxxxxxxxxxx> > Cc: Russell King <linux@xxxxxxxxxxxxxxxx> > Cc: Benoit Masson <yahoo@xxxxxxxxxxxx> > Cc: linux-arm-kernel@xxxxxxxxxxxxxxxxxxx > Cc: devicetree@xxxxxxxxxxxxxxx > Cc: linux-kernel@xxxxxxxxxxxxxxx > --- > arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts | 67 +++++++++++++------------ > 1 file changed, 36 insertions(+), 31 deletions(-) > > diff --git a/arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts b/arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts > index 30a0a6eac645..76781fd18624 100644 > --- a/arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts > +++ b/arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts > @@ -151,37 +151,42 @@ > marvell,nand-enable-arbiter; > nand-on-flash-bbt; > > - partition@0 { > - label = "u-boot"; > - reg = <0x0000000 0xe0000>; > - read-only; > - }; > - > - partition@e0000 { > - label = "u-boot-env"; > - reg = <0xe0000 0x20000>; > - read-only; > - }; > - > - partition@100000 { > - label = "u-boot-env2"; > - reg = <0x100000 0x20000>; > - read-only; > - }; > - > - partition@120000 { > - label = "zImage"; > - reg = <0x120000 0x400000>; > - }; > - > - partition@520000 { > - label = "initrd"; > - reg = <0x520000 0x400000>; > - }; > - > - partition@xE00000 { > - label = "boot"; > - reg = <0xE00000 0x3F200000>; > + partitions { > + #address-cells = <1>; > + #size-cells = <1>; > + > + partition@0 { > + label = "u-boot"; > + reg = <0x0000000 0xe0000>; > + read-only; > + }; > + > + partition@e0000 { > + label = "u-boot-env"; > + reg = <0xe0000 0x20000>; > + read-only; > + }; > + > + partition@100000 { > + label = "u-boot-env2"; > + reg = <0x100000 0x20000>; > + read-only; > + }; > + > + partition@120000 { > + label = "zImage"; > + reg = <0x120000 0x400000>; > + }; > + > + partition@520000 { > + label = "initrd"; > + reg = <0x520000 0x400000>; > + }; > + > + partition@xE00000 { > + label = "boot"; > + reg = <0xE00000 0x3F200000>; > + }; > }; > }; > }; > -- > 2.1.4 > > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel@xxxxxxxxxxxxxxxxxxx > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel -- Gregory Clement, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html