| Message ID | 1417746508-14557-1-git-send-email-horms+renesas@verge.net.au (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 5f950e62b476c62fd8a6549f3889e08e478252f3 |
| Headers | show |
On Fri, Dec 5, 2014 at 3:28 AM, Simon Horman <horms+renesas@verge.net.au> wrote: > Update the size and names of flash partitions to match the > expectations of the loader which are as follows: > > "loader"---0x0000_0000-0x0008_0000 [loader program (readonly)] > "user" ---0x0008_0000-0x0060_0000 [U-Boot + bootargs + dt + uImage (readonly)] > "flash" ---0x0060_0000-0x0400_0000 [filesystem and free (read/write)] > > ["user"'s assumed breakdown] > U-boot (0x0008_0000-0x000c_0000) 256KiB > bootargs (0x000c_0000-0x0010_0000) 256KiB > Device tree (0x0010_0000-0x0014_0000) 256KiB > zImage (0x0014_0000-0x0060_0000) 4.75MiB > > Signed-off-by: Simon Horman <horms+renesas@verge.net.au> Acked-by: Geert Uytterhoeven <geert+renesas@glider.be> Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Fri, Dec 05, 2014 at 10:51:33AM +0100, Geert Uytterhoeven wrote: > On Fri, Dec 5, 2014 at 3:28 AM, Simon Horman <horms+renesas@verge.net.au> wrote: > > Update the size and names of flash partitions to match the > > expectations of the loader which are as follows: > > > > "loader"---0x0000_0000-0x0008_0000 [loader program (readonly)] > > "user" ---0x0008_0000-0x0060_0000 [U-Boot + bootargs + dt + uImage (readonly)] > > "flash" ---0x0060_0000-0x0400_0000 [filesystem and free (read/write)] > > > > ["user"'s assumed breakdown] > > U-boot (0x0008_0000-0x000c_0000) 256KiB > > bootargs (0x000c_0000-0x0010_0000) 256KiB > > Device tree (0x0010_0000-0x0014_0000) 256KiB > > zImage (0x0014_0000-0x0060_0000) 4.75MiB > > > > Signed-off-by: Simon Horman <horms+renesas@verge.net.au> > > Acked-by: Geert Uytterhoeven <geert+renesas@glider.be> Thanks, I have queued this up. -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/arm/boot/dts/r8a7791-koelsch.dts b/arch/arm/boot/dts/r8a7791-koelsch.dts index bf58c79..6938377 100644 --- a/arch/arm/boot/dts/r8a7791-koelsch.dts +++ b/arch/arm/boot/dts/r8a7791-koelsch.dts @@ -452,13 +452,13 @@ read-only; }; partition@80000 { - label = "bootenv"; - reg = <0x00080000 0x00080000>; + label = "user"; + reg = <0x00080000 0x00580000>; read-only; }; - partition@100000 { - label = "data"; - reg = <0x00100000 0x03f00000>; + partition@600000 { + label = "flash"; + reg = <0x00600000 0x03a00000>; }; }; };
Update the size and names of flash partitions to match the expectations of the loader which are as follows: "loader"---0x0000_0000-0x0008_0000 [loader program (readonly)] "user" ---0x0008_0000-0x0060_0000 [U-Boot + bootargs + dt + uImage (readonly)] "flash" ---0x0060_0000-0x0400_0000 [filesystem and free (read/write)] ["user"'s assumed breakdown] U-boot (0x0008_0000-0x000c_0000) 256KiB bootargs (0x000c_0000-0x0010_0000) 256KiB Device tree (0x0010_0000-0x0014_0000) 256KiB zImage (0x0014_0000-0x0060_0000) 4.75MiB Signed-off-by: Simon Horman <horms+renesas@verge.net.au> --- v2 * As suggested by Geert Uytterhoeven - Break out U-boot and bootargs into separate areas within the user partition description in the changelog - Refer to zImage rather than uImage in the changelog * As suggested by Sergei Shtylyov - Correct base address of partition nodes to match the base address of their register This replaces a patch that I previously posted, "shmobile: koelsch: Fix flash partition label and size in device tree", which has the same aim but does so for an older version of the loader which to my knowledge is not found in the wild. I plan to post a similar patch for Lager if this one goes well. I have been informed that the flash layout should also be the same for Alt (which currently does not have flash in its dts file in mainline). --- arch/arm/boot/dts/r8a7791-koelsch.dts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)