ARM: shmobile: koelsch: Fix flash partition label and size in device tree

PATCH New Simon Horman 3 participants 3 messages Oct 30, 2014

Subsystems (2)

Device tree bindings SuperH

lore

Share & tools

lore

Simon Horman

author

2014-10-30 05:54 UTC #0 lore raw

PATCH 1/1 ARM: shmobile: koelsch: Fix flash partition label and size in device tree

From: Hisashi Nakamura <[email protected]>

The size and the name of flash partition are consistent across use the R-Car Gen2 series.

This patch makes the koelsch board consistent with the lager board.

Signed-off-by Hisashi Nakamura <[email protected]>

[simon: reworded changelog]

Signed-off-by Simon Horman <[email protected]>

---
Based on the renesas-devel-20141030-v3.18-rc2 branch of my renesas tree

 arch/arm/boot/dts/r8a7791-koelsch.dts | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

arch/arm/boot/dts/r8a7791-koelsch.dts +7 -7

index 523ae4d..90587f0 100644
@@ -390,17 +390,17 @@
 
 		partition at 0 {
 			label = "loader";
-			reg = <0x00000000 0x00080000>;
+			reg = <0x00000000 0x00040000>;
 			read-only;
 		};
-		partition at 80000 {
-			label = "bootenv";
-			reg = <0x00080000 0x00080000>;
+		partition at 40000 {
+			label = "user";
+			reg = <0x00040000 0x00400000>;
 			read-only;
 		};
-		partition at 100000 {
-			label = "data";
-			reg = <0x00100000 0x03f00000>;
+		partition at 440000 {
+			label = "flash";
+			reg = <0x00440000 0x03bc0000>;
 		};
 	};
 };

Signature · 1 line

2.1.1

Geert Uytterhoeven

2014-10-30 10:23 UTC #1 lore raw

PATCH 1/1 ARM: shmobile: koelsch: Fix flash partition label and size in device tree

Quoted 6 lines · Simon Horman

From: Hisashi Nakamura <[email protected]>
The size and the name of flash partition are consistent across use the R-Car Gen2 series.
This patch makes the koelsch board consistent with the lager board.

Does this match the actual data in the FLASH?

On my board, the SPI boot loader is at 0x00000000. There's also a small unidentified chunk at 0x00040000:

    00040000  00 40 30 e6 5c 3a 03 00  ff ff ff ff ff ff ff ff

|. at 0.\:..........|

u-Boot seems to be at 0x00080000.
u-Boot environment variables are saved at 0x000c0000. This does match the old "bootenv" partition.

After that it's all-zeroes until 0x00100000, where I did my SPI tests, based on the old layout.

Do I have a non-standard Koelsch FLASH layout on my board?

Quoted 17 lines

arch/arm/boot/dts/r8a7791-koelsch.dts +4 -4

@@ -390,17 +390,17 @@
 
                partition at 0 {
                        label = "loader";
-                       reg = <0x00000000 0x00080000>;
+                       reg = <0x00000000 0x00040000>;
                        read-only;
                };
-               partition at 80000 {
-                       label = "bootenv";
-                       reg = <0x00080000 0x00080000>;
+               partition at 40000 {
+                       label = "user";
+                       reg = <0x00040000 0x00400000>;
                        read-only;

arch/arm/boot/dts/r8a7791-koelsch.dts line 406

Quoted 10 lines

arch/arm/boot/dts/r8a7791-koelsch.dts +3 -3

                };
-               partition at 100000 {
-                       label = "data";
-                       reg = <0x00100000 0x03f00000>;
+               partition at 440000 {
+                       label = "flash";
+                       reg = <0x00440000 0x03bc0000>;
                };
        };
 };

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert at 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

Chai Wen

2014-10-30 10:50 UTC #2 lore raw

PATCH 1/1 ARM: shmobile: koelsch: Fix flash partition label and size in device tree

Quoted 17 lines · Geert Uytterhoeven

Quoted 6 lines · Simon Horman
From: Hisashi Nakamura <[email protected]>
The size and the name of flash partition are consistent across use the R-Car Gen2 series.
This patch makes the koelsch board consistent with the lager board.
Does this match the actual data in the FLASH?
On my board, the SPI boot loader is at 0x00000000. There's also a small unidentified chunk at 0x00040000:
    00040000  00 40 30 e6 5c 3a 03 00  ff ff ff ff ff ff ff ff
|. at 0.\:..........|

Quoted 8 lines

u-Boot seems to be at 0x00080000.
u-Boot environment variables are saved at 0x000c0000. This does match the old "bootenv" partition.
After that it's all-zeroes until 0x00100000, where I did my SPI tests, based on the old layout.
Do I have a non-standard Koelsch FLASH layout on my board?

FYI, I have a koelsch board, and the layout out the flash is like:

0x0 0x10000 0x50000

|-- loader.bin --|--    uboot.bin    --|--           something else  --|
0               64K                   320K                             16M

But, I have no idea whether this is a standard layout or not.

thanks
chai wen

Quoted 45 lines

Quoted 18 lines
arch/arm/boot/dts/r8a7791-koelsch.dts +4 -4
@@ -390,17 +390,17 @@
 
                partition at 0 {
                        label = "loader";
-                       reg = <0x00000000 0x00080000>;
+                       reg = <0x00000000 0x00040000>;
                        read-only;
                };
-               partition at 80000 {
-                       label = "bootenv";
-                       reg = <0x00080000 0x00080000>;
+               partition at 40000 {
+                       label = "user";
+                       reg = <0x00040000 0x00400000>;
                        read-only;
arch/arm/boot/dts/r8a7791-koelsch.dts line 406
Quoted 10 lines
arch/arm/boot/dts/r8a7791-koelsch.dts +3 -3
                };
-               partition at 100000 {
-                       label = "data";
-                       reg = <0x00100000 0x03f00000>;
+               partition at 440000 {
+                       label = "flash";
+                       reg = <0x00440000 0x03bc0000>;
                };
        };
 };
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert at 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 at vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
.

Signature · 3 lines

Regards

Chai Wen