diff for duplicates of <51B74267.1000700@collabora.co.uk> diff --git a/a/1.txt b/N1/1.txt index 739bf86..e19d2eb 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -16,31 +16,31 @@ On 06/11/2013 04:48 PM, Florian Vaussard wrote: > +++ b/arch/arm/boot/dts/omap3-devkit8000.dts > @@ -143,27 +143,27 @@ > -> x-loader@0 { +> x-loader at 0 { > label = "X-Loader"; > - reg = <0 0x80000>; > + reg = <(0 * SZ_128K) (4 * SZ_128K)>; > }; > -> bootloaders@80000 { +> bootloaders at 80000 { > label = "U-Boot"; > - reg = <0x80000 0x1e0000>; > + reg = <(4 * SZ_128K) (15 * SZ_128K)>; > }; > -> bootloaders_env@260000 { +> bootloaders_env at 260000 { > label = "U-Boot Env"; > - reg = <0x260000 0x20000>; > + reg = <(19 * SZ_128K) (1 * SZ_128K)>; > }; > -> kernel@280000 { +> kernel at 280000 { > label = "Kernel"; > - reg = <0x280000 0x400000>; > + reg = <(20 * SZ_128K) (32 * SZ_128K)>; > }; > -> filesystem@680000 { +> filesystem at 680000 { > label = "File System"; > - reg = <0x680000 0xf980000>; > + reg = <(52 * SZ_128K) MTDPART_SIZ_FULL>; @@ -53,27 +53,27 @@ On 06/11/2013 04:48 PM, Florian Vaussard wrote: > +++ b/arch/arm/boot/dts/omap3-igep0020.dts > @@ -97,23 +97,23 @@ > -> partition@0 { +> partition at 0 { > label = "SPL"; > - reg = <0 0x100000>; > + reg = <(0 * SZ_256K) (4 * SZ_256K)>; > }; -> partition@0x80000 { +> partition at 0x80000 { > label = "U-Boot"; > - reg = <0x100000 0x180000>; > + reg = <(4 * SZ_256K) (6 * SZ_256K)>; > }; -> partition@0x1c0000 { +> partition at 0x1c0000 { > label = "Environment"; > - reg = <0x280000 0x100000>; > + reg = <(10 * SZ_256K) (4 * SZ_256K)>; > }; -> partition@0x280000 { +> partition at 0x280000 { > label = "Kernel"; > - reg = <0x380000 0x300000>; > + reg = <(14 * SZ_256K) (12 * SZ_256K)>; > }; -> partition@0x780000 { +> partition at 0x780000 { > label = "Filesystem"; > - reg = <0x680000 0x1f980000>; > + reg = <(26 * SZ_256K) MTDPART_SIZ_FULL>; @@ -86,27 +86,27 @@ On 06/11/2013 04:48 PM, Florian Vaussard wrote: > +++ b/arch/arm/boot/dts/omap3-igep0030.dts > @@ -72,23 +72,23 @@ > -> partition@0 { +> partition at 0 { > label = "SPL"; > - reg = <0 0x100000>; > + reg = <(0 * SZ_256K) (4 * SZ_256K)>; > }; -> partition@0x80000 { +> partition at 0x80000 { > label = "U-Boot"; > - reg = <0x100000 0x180000>; > + reg = <(4 * SZ_256K) (6 * SZ_256K)>; > }; -> partition@0x1c0000 { +> partition at 0x1c0000 { > label = "Environment"; > - reg = <0x280000 0x100000>; > + reg = <(10 * SZ_256K) (4 * SZ_256K)>; > }; -> partition@0x280000 { +> partition at 0x280000 { > label = "Kernel"; > - reg = <0x380000 0x300000>; > + reg = <(14 * SZ_256K) (12 * SZ_256K)>; > }; -> partition@0x780000 { +> partition at 0x780000 { > label = "Filesystem"; > - reg = <0x680000 0x1f980000>; > + reg = <(26 * SZ_256K) MTDPART_SIZ_FULL>; diff --git a/a/content_digest b/N1/content_digest index 4c33e94..197297e 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,16 +1,9 @@ "ref\01370962138-9631-1-git-send-email-florian.vaussard@epfl.ch\0" "ref\01370962138-9631-4-git-send-email-florian.vaussard@epfl.ch\0" - "From\0Javier Martinez Canillas <javier.martinez@collabora.co.uk>\0" - "Subject\0Re: [PATCH 3/3] ARM: dts: OMAP3: Use MTD constants for OMAP3 boards\0" + "From\0javier.martinez@collabora.co.uk (Javier Martinez Canillas)\0" + "Subject\0[PATCH 3/3] ARM: dts: OMAP3: Use MTD constants for OMAP3 boards\0" "Date\0Tue, 11 Jun 2013 17:29:43 +0200\0" - "To\0Florian Vaussard <florian.vaussard@epfl.ch>\0" - "Cc\0Benoit Cousson <b-cousson@ti.com>" - Tony Lindgren <tony@atomide.com> - Stephen Warren <swarren@wwwdotorg.org> - Anil Kumar <anilk4.v@gmail.com> - linux-omap@vger.kernel.org - devicetree-discuss@lists.ozlabs.org - " linux-arm-kernel@lists.infradead.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On 06/11/2013 04:48 PM, Florian Vaussard wrote:\n" @@ -31,31 +24,31 @@ "> +++ b/arch/arm/boot/dts/omap3-devkit8000.dts\n" "> @@ -143,27 +143,27 @@\n" "> \n" - "> \t\tx-loader@0 {\n" + "> \t\tx-loader at 0 {\n" "> \t\t\tlabel = \"X-Loader\";\n" "> -\t\t\treg = <0 0x80000>;\n" "> +\t\t\treg = <(0 * SZ_128K) (4 * SZ_128K)>;\n" "> \t\t};\n" "> \n" - "> \t\tbootloaders@80000 {\n" + "> \t\tbootloaders at 80000 {\n" "> \t\t\tlabel = \"U-Boot\";\n" "> -\t\t\treg = <0x80000 0x1e0000>;\n" "> +\t\t\treg = <(4 * SZ_128K) (15 * SZ_128K)>;\n" "> \t\t};\n" "> \n" - "> \t\tbootloaders_env@260000 {\n" + "> \t\tbootloaders_env at 260000 {\n" "> \t\t\tlabel = \"U-Boot Env\";\n" "> -\t\t\treg = <0x260000 0x20000>;\n" "> +\t\t\treg = <(19 * SZ_128K) (1 * SZ_128K)>;\n" "> \t\t};\n" "> \n" - "> \t\tkernel@280000 {\n" + "> \t\tkernel at 280000 {\n" "> \t\t\tlabel = \"Kernel\";\n" "> -\t\t\treg = <0x280000 0x400000>;\n" "> +\t\t\treg = <(20 * SZ_128K) (32 * SZ_128K)>;\n" "> \t\t};\n" "> \n" - "> \t\tfilesystem@680000 {\n" + "> \t\tfilesystem at 680000 {\n" "> \t\t\tlabel = \"File System\";\n" "> -\t\t\treg = <0x680000 0xf980000>;\n" "> +\t\t\treg = <(52 * SZ_128K) MTDPART_SIZ_FULL>;\n" @@ -68,27 +61,27 @@ "> +++ b/arch/arm/boot/dts/omap3-igep0020.dts\n" "> @@ -97,23 +97,23 @@\n" "> \n" - "> \t\tpartition@0 {\n" + "> \t\tpartition at 0 {\n" "> \t\t\tlabel = \"SPL\";\n" "> -\t\t\treg = <0 0x100000>;\n" "> +\t\t\treg = <(0 * SZ_256K) (4 * SZ_256K)>;\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 = <(4 * SZ_256K) (6 * SZ_256K)>;\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 = <(10 * SZ_256K) (4 * SZ_256K)>;\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 = <(14 * SZ_256K) (12 * SZ_256K)>;\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 = <(26 * SZ_256K) MTDPART_SIZ_FULL>;\n" @@ -101,27 +94,27 @@ "> +++ b/arch/arm/boot/dts/omap3-igep0030.dts\n" "> @@ -72,23 +72,23 @@\n" "> \n" - "> \t\tpartition@0 {\n" + "> \t\tpartition at 0 {\n" "> \t\t\tlabel = \"SPL\";\n" "> -\t\t\treg = <0 0x100000>;\n" "> +\t\t\treg = <(0 * SZ_256K) (4 * SZ_256K)>;\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 = <(4 * SZ_256K) (6 * SZ_256K)>;\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 = <(10 * SZ_256K) (4 * SZ_256K)>;\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 = <(14 * SZ_256K) (12 * SZ_256K)>;\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 = <(26 * SZ_256K) MTDPART_SIZ_FULL>;\n" @@ -141,4 +134,4 @@ "\n" Acked-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk> -bece17e877dd6b1908f719ac743a15a322e849822ecb407e5bc6d3e428633082 +fd0115c54bb951ce74b661496ebee787a70b627fa88bb19dec8995adfa76ef16
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.