diff for duplicates of <51B75EAE.6070405@epfl.ch> diff --git a/a/1.txt b/N1/1.txt index 53ef73c..00a9693 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -19,31 +19,31 @@ On 06/11/2013 05:29 PM, Javier Martinez Canillas 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>; @@ -56,27 +56,27 @@ On 06/11/2013 05:29 PM, Javier Martinez Canillas 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>; @@ -89,27 +89,27 @@ On 06/11/2013 05:29 PM, Javier Martinez Canillas 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 b717d63..015824a 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,17 +1,10 @@ "ref\01370962138-9631-1-git-send-email-florian.vaussard@epfl.ch\0" "ref\01370962138-9631-4-git-send-email-florian.vaussard@epfl.ch\0" "ref\051B74267.1000700@collabora.co.uk\0" - "From\0Florian Vaussard <florian.vaussard@epfl.ch>\0" - "Subject\0Re: [PATCH 3/3] ARM: dts: OMAP3: Use MTD constants for OMAP3 boards\0" + "From\0florian.vaussard@epfl.ch (Florian Vaussard)\0" + "Subject\0[PATCH 3/3] ARM: dts: OMAP3: Use MTD constants for OMAP3 boards\0" "Date\0Tue, 11 Jun 2013 19:30:22 +0200\0" - "To\0Javier Martinez Canillas <javier.martinez@collabora.co.uk>\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" "Hello Javier,\n" @@ -35,31 +28,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" @@ -72,27 +65,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" @@ -105,27 +98,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" @@ -155,4 +148,4 @@ "\n" Florian -0591b5fcacdb10db2625714a24e26526e2960d06663436ff53524c213ec6cf71 +b923d3c3aee2bb210804c67f1d440eeb41a19bb67c9a2b2cfe4b1d7acc61bf70
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.