diff for duplicates of <20131015184306.GC11234@atomide.com> diff --git a/a/1.txt b/N1/1.txt index 12e4d2b..98bae1f 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -21,7 +21,7 @@ Tony @@ -94,7 +94,7 @@ <5 0 0x2c000000 0x01000000>; - nand@0,0 { + nand at 0,0 { - linux,mtd-name= "micron,mt29c4g96maz"; + linux,mtd-name= "hynix,h8kds0un0mer-4em"; reg = <0 0 0>; @@ -30,28 +30,28 @@ Tony @@ -118,24 +118,24 @@ #size-cells = <1>; - partition@0 { + partition at 0 { - label = "SPL"; - reg = <0 0x100000>; + label = "X-Loader"; + reg = <0 0x80000>; }; - partition@0x80000 { + partition at 0x80000 { label = "U-Boot"; - reg = <0x100000 0x180000>; + reg = <0x80000 0x1c0000>; }; - partition@0x1c0000 { + partition at 0x1c0000 { label = "Environment"; - reg = <0x280000 0x100000>; + reg = <0x240000 0x40000>; }; - partition@0x280000 { + partition at 0x280000 { label = "Kernel"; - reg = <0x380000 0x300000>; + reg = <0x280000 0x500000>; }; - partition@0x780000 { + partition at 0x780000 { label = "Filesystem"; - reg = <0x680000 0x1f980000>; + reg = <0x780000 0x1f880000>; diff --git a/a/content_digest b/N1/content_digest index 0ea7ef5..60c568b 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,11 +1,9 @@ "ref\020131010221833.9063.49904.stgit@localhost\0" "ref\020131010222053.9063.81702.stgit@localhost\0" - "From\0Tony Lindgren <tony@atomide.com>\0" - "Subject\0Re: [PATCH 5/8] ARM: dts: Add basic support for TMDSEVM3730 (Mistral AM/DM37x EVM)\0" + "From\0tony@atomide.com (Tony Lindgren)\0" + "Subject\0[PATCH 5/8] ARM: dts: Add basic support for TMDSEVM3730 (Mistral AM/DM37x EVM)\0" "Date\0Tue, 15 Oct 2013 11:43:32 -0700\0" "To\0linux-arm-kernel@lists.infradead.org\0" - "Cc\0devicetree@vger.kernel.org" - " linux-omap@vger.kernel.org\0" "\00:1\0" "b\0" "* Tony Lindgren <tony@atomide.com> [131010 15:29]:\n" @@ -31,7 +29,7 @@ "@@ -94,7 +94,7 @@\n" " \t\t <5 0 0x2c000000 0x01000000>;\n" " \n" - " \tnand@0,0 {\n" + " \tnand at 0,0 {\n" "-\t\tlinux,mtd-name= \"micron,mt29c4g96maz\";\n" "+\t\tlinux,mtd-name= \"hynix,h8kds0un0mer-4em\";\n" " \t\treg = <0 0 0>;\n" @@ -40,32 +38,32 @@ "@@ -118,24 +118,24 @@\n" " \t\t#size-cells = <1>;\n" " \n" - " \t\tpartition@0 {\n" + " \t\tpartition at 0 {\n" "-\t\t\tlabel = \"SPL\";\n" "-\t\t\treg = <0 0x100000>;\n" "+\t\t\tlabel = \"X-Loader\";\n" "+\t\t\treg = <0 0x80000>;\n" " \t\t};\n" - " \t\tpartition@0x80000 {\n" + " \t\tpartition at 0x80000 {\n" " \t\t\tlabel = \"U-Boot\";\n" "-\t\t\treg = <0x100000 0x180000>;\n" "+\t\t\treg = <0x80000 0x1c0000>;\n" " \t\t};\n" - " \t\tpartition@0x1c0000 {\n" + " \t\tpartition at 0x1c0000 {\n" " \t\t\tlabel = \"Environment\";\n" "-\t\t\treg = <0x280000 0x100000>;\n" "+\t\t\treg = <0x240000 0x40000>;\n" " \t\t};\n" - " \t\tpartition@0x280000 {\n" + " \t\tpartition at 0x280000 {\n" " \t\t\tlabel = \"Kernel\";\n" "-\t\t\treg = <0x380000 0x300000>;\n" "+\t\t\treg = <0x280000 0x500000>;\n" " \t\t};\n" - " \t\tpartition@0x780000 {\n" + " \t\tpartition at 0x780000 {\n" " \t\t\tlabel = \"Filesystem\";\n" "-\t\t\treg = <0x680000 0x1f980000>;\n" "+\t\t\treg = <0x780000 0x1f880000>;\n" " \t\t};\n" " \t};" -2bd34a2309d1f76ac22a4ab993bf18e14b42ed82640a14e0e927d350e8b9c3cb +5a9e8c036b07c2b1ea249dd994624a829c182a7592620825545feaea8c057d29
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.