diff for duplicates of <5659E692.9040007@gmail.com> diff --git a/a/1.txt b/N1/1.txt index 10a40d7..dff71d2 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -48,9 +48,9 @@ Sebastian >> Cc: Kumar Gala <galak@codeaurora.org> >> Cc: Russell King <linux@arm.linux.org.uk> >> Cc: Benoit Masson <yahoo@perenite.com> ->> Cc: linux-arm-kernel at lists.infradead.org ->> Cc: devicetree at vger.kernel.org ->> Cc: linux-kernel at vger.kernel.org +>> Cc: linux-arm-kernel@lists.infradead.org +>> Cc: devicetree@vger.kernel.org +>> Cc: linux-kernel@vger.kernel.org >> --- >> arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts | 67 +++++++++++++------------ >> 1 file changed, 36 insertions(+), 31 deletions(-) @@ -63,70 +63,70 @@ Sebastian >> marvell,nand-enable-arbiter; >> nand-on-flash-bbt; >> ->> - partition at 0 { +>> - partition@0 { >> - label = "u-boot"; >> - reg = <0x0000000 0xe0000>; >> - read-only; >> - }; >> - ->> - partition at e0000 { +>> - partition@e0000 { >> - label = "u-boot-env"; >> - reg = <0xe0000 0x20000>; >> - read-only; >> - }; >> - ->> - partition at 100000 { +>> - partition@100000 { >> - label = "u-boot-env2"; >> - reg = <0x100000 0x20000>; >> - read-only; >> - }; >> - ->> - partition at 120000 { +>> - partition@120000 { >> - label = "zImage"; >> - reg = <0x120000 0x400000>; >> - }; >> - ->> - partition at 520000 { +>> - partition@520000 { >> - label = "initrd"; >> - reg = <0x520000 0x400000>; >> - }; >> - ->> - partition at xE00000 { +>> - partition@xE00000 { >> - label = "boot"; >> - reg = <0xE00000 0x3F200000>; >> + partitions { >> + #address-cells = <1>; >> + #size-cells = <1>; >> + ->> + partition at 0 { +>> + partition@0 { >> + label = "u-boot"; >> + reg = <0x0000000 0xe0000>; >> + read-only; >> + }; >> + ->> + partition at e0000 { +>> + partition@e0000 { >> + label = "u-boot-env"; >> + reg = <0xe0000 0x20000>; >> + read-only; >> + }; >> + ->> + partition at 100000 { +>> + partition@100000 { >> + label = "u-boot-env2"; >> + reg = <0x100000 0x20000>; >> + read-only; >> + }; >> + ->> + partition at 120000 { +>> + partition@120000 { >> + label = "zImage"; >> + reg = <0x120000 0x400000>; >> + }; >> + ->> + partition at 520000 { +>> + partition@520000 { >> + label = "initrd"; >> + reg = <0x520000 0x400000>; >> + }; >> + ->> + partition at xE00000 { +>> + partition@xE00000 { >> + label = "boot"; >> + reg = <0xE00000 0x3F200000>; >> + }; diff --git a/a/content_digest b/N1/content_digest index 9ab764c..d61c975 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,10 +1,22 @@ "ref\01448709248-21177-1-git-send-email-sebastian.hesselbarth@gmail.com\0" "ref\01448709248-21177-3-git-send-email-sebastian.hesselbarth@gmail.com\0" "ref\020151128170036.GH32356@lunn.ch\0" - "From\0sebastian.hesselbarth@gmail.com (Sebastian Hesselbarth)\0" - "Subject\0[PATCH 2/4] ARM: dt: mvebu: ix4-300d: move partitions to partition sub-node\0" + "From\0Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>\0" + "Subject\0Re: [PATCH 2/4] ARM: dt: mvebu: ix4-300d: move partitions to partition sub-node\0" "Date\0Sat, 28 Nov 2015 18:38:26 +0100\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Andrew Lunn <andrew@lunn.ch>\0" + "Cc\0Jason Cooper <jason@lakedaemon.net>" + Gregory Clement <gregory.clement@free-electrons.com> + Rob Herring <robh+dt@kernel.org> + Pawel Moll <pawel.moll@arm.com> + Mark Rutland <mark.rutland@arm.com> + Ian Campbell <ijc+devicetree@hellion.org.uk> + Kumar Gala <galak@codeaurora.org> + Russell King <linux@arm.linux.org.uk> + Benoit Masson <yahoo@perenite.com> + linux-arm-kernel@lists.infradead.org + devicetree@vger.kernel.org + " linux-kernel@vger.kernel.org\0" "\00:1\0" "b\0" "On 28.11.2015 18:00, Andrew Lunn wrote:\n" @@ -57,9 +69,9 @@ ">> Cc: Kumar Gala <galak@codeaurora.org> \n" ">> Cc: Russell King <linux@arm.linux.org.uk> \n" ">> Cc: Benoit Masson <yahoo@perenite.com>\n" - ">> Cc: linux-arm-kernel at lists.infradead.org \n" - ">> Cc: devicetree at vger.kernel.org \n" - ">> Cc: linux-kernel at vger.kernel.org \n" + ">> Cc: linux-arm-kernel@lists.infradead.org \n" + ">> Cc: devicetree@vger.kernel.org \n" + ">> Cc: linux-kernel@vger.kernel.org \n" ">> ---\n" ">> arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts | 67 +++++++++++++------------\n" ">> 1 file changed, 36 insertions(+), 31 deletions(-)\n" @@ -72,70 +84,70 @@ ">> \t\t\t\tmarvell,nand-enable-arbiter;\n" ">> \t\t\t\tnand-on-flash-bbt;\n" ">> \n" - ">> -\t\t\t\tpartition at 0 {\n" + ">> -\t\t\t\tpartition@0 {\n" ">> -\t\t\t\t\tlabel = \"u-boot\";\n" ">> -\t\t\t\t\treg = <0x0000000 0xe0000>;\n" ">> -\t\t\t\t\tread-only;\n" ">> -\t\t\t\t};\n" ">> -\n" - ">> -\t\t\t\tpartition at e0000 {\n" + ">> -\t\t\t\tpartition@e0000 {\n" ">> -\t\t\t\t\tlabel = \"u-boot-env\";\n" ">> -\t\t\t\t\treg = <0xe0000 0x20000>;\n" ">> -\t\t\t\t\tread-only;\n" ">> -\t\t\t\t};\n" ">> -\n" - ">> -\t\t\t\tpartition at 100000 {\n" + ">> -\t\t\t\tpartition@100000 {\n" ">> -\t\t\t\t\tlabel = \"u-boot-env2\";\n" ">> -\t\t\t\t\treg = <0x100000 0x20000>;\n" ">> -\t\t\t\t\tread-only;\n" ">> -\t\t\t\t};\n" ">> -\n" - ">> -\t\t\t\tpartition at 120000 {\n" + ">> -\t\t\t\tpartition@120000 {\n" ">> -\t\t\t\t\tlabel = \"zImage\";\n" ">> -\t\t\t\t\treg = <0x120000 0x400000>;\n" ">> -\t\t\t\t};\n" ">> -\n" - ">> -\t\t\t\tpartition at 520000 {\n" + ">> -\t\t\t\tpartition@520000 {\n" ">> -\t\t\t\t\tlabel = \"initrd\";\n" ">> -\t\t\t\t\treg = <0x520000 0x400000>;\n" ">> -\t\t\t\t};\n" ">> -\n" - ">> -\t\t\t\tpartition at xE00000 {\n" + ">> -\t\t\t\tpartition@xE00000 {\n" ">> -\t\t\t\t\tlabel = \"boot\";\n" ">> -\t\t\t\t\treg = <0xE00000 0x3F200000>;\n" ">> +\t\t\t\tpartitions {\n" ">> +\t\t\t\t\t#address-cells = <1>;\n" ">> +\t\t\t\t\t#size-cells = <1>;\n" ">> +\n" - ">> +\t\t\t\t\tpartition at 0 {\n" + ">> +\t\t\t\t\tpartition@0 {\n" ">> +\t\t\t\t\t\tlabel = \"u-boot\";\n" ">> +\t\t\t\t\t\treg = <0x0000000 0xe0000>;\n" ">> +\t\t\t\t\t\tread-only;\n" ">> +\t\t\t\t\t};\n" ">> +\n" - ">> +\t\t\t\t\tpartition at e0000 {\n" + ">> +\t\t\t\t\tpartition@e0000 {\n" ">> +\t\t\t\t\t\tlabel = \"u-boot-env\";\n" ">> +\t\t\t\t\t\treg = <0xe0000 0x20000>;\n" ">> +\t\t\t\t\t\tread-only;\n" ">> +\t\t\t\t\t};\n" ">> +\n" - ">> +\t\t\t\t\tpartition at 100000 {\n" + ">> +\t\t\t\t\tpartition@100000 {\n" ">> +\t\t\t\t\t\tlabel = \"u-boot-env2\";\n" ">> +\t\t\t\t\t\treg = <0x100000 0x20000>;\n" ">> +\t\t\t\t\t\tread-only;\n" ">> +\t\t\t\t\t};\n" ">> +\n" - ">> +\t\t\t\t\tpartition at 120000 {\n" + ">> +\t\t\t\t\tpartition@120000 {\n" ">> +\t\t\t\t\t\tlabel = \"zImage\";\n" ">> +\t\t\t\t\t\treg = <0x120000 0x400000>;\n" ">> +\t\t\t\t\t};\n" ">> +\n" - ">> +\t\t\t\t\tpartition at 520000 {\n" + ">> +\t\t\t\t\tpartition@520000 {\n" ">> +\t\t\t\t\t\tlabel = \"initrd\";\n" ">> +\t\t\t\t\t\treg = <0x520000 0x400000>;\n" ">> +\t\t\t\t\t};\n" ">> +\n" - ">> +\t\t\t\t\tpartition at xE00000 {\n" + ">> +\t\t\t\t\tpartition@xE00000 {\n" ">> +\t\t\t\t\t\tlabel = \"boot\";\n" ">> +\t\t\t\t\t\treg = <0xE00000 0x3F200000>;\n" ">> +\t\t\t\t\t};\n" @@ -146,4 +158,4 @@ ">> 2.1.4\n" >> -b9c3cdf0ad31b71fc40cc28031b0a6f5431600040cb30a28adbc6ade1c75baab +712a62eb64a94f00ad50c3c5f712d9395cf9b17679910ca0ab73664c1d9663b2
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.