arm: socfpga: cyclone5_socdk: Update qspiboot to use UBIFS

PATCH New Chin Liang See 2 participants 5 messages Dec 21, 2015 – Dec 22, 2015

lore

Share & tools

lore

Chin Liang See

author

2015-12-21 16:08 UTC #0 lore raw

PATCH 1/1 arm: socfpga: cyclone5_socdk: Update qspiboot to use UBIFS

Update the qspiboot console command to use UBIFS instead of old jffs2 file system.

Signed-off-by Chin Liang See <[email protected]>

Cc Dinh Nguyen <[email protected]>

Cc Pavel Machek <[email protected]>

Cc Marek Vasut <[email protected]>

Cc Stefan Roese <[email protected]>

---
 include/configs/socfpga_cyclone5_socdk.h | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

include/configs/socfpga_cyclone5_socdk.h +2 -4

index 61450cb..a0f62ef 100644
@@ -71,11 +71,9 @@
 		"load mmc 0:1 ${loadaddr} ${bootimage};" \
 		"load mmc 0:1 ${fdt_addr} ${fdtimage}\0" \
 	"qspiload=sf probe; mtdparts default;run ubiload\0" \
-	"qspiroot=/dev/mtdblock0\0" \
-	"qspirootfstype=jffs2\0" \
 	"qspiboot=setenv bootargs " CONFIG_BOOTARGS \
-		" root=${qspiroot} rw rootfstype=${qspirootfstype};"\
-		"bootm ${loadaddr} - ${fdt_addr}\0" \
+		" ubi.mtd=1,64 root=ubi0:rootfs rw rootfstype=ubifs;"\
+		"bootz ${loadaddr} - ${fdt_addr}\0" \
 	"ubiload=ubi part UBI; ubifsmount ubi0;" \
 		"ubifsload ${loadaddr} /boot/${bootimage};" \
 		"ubifsload ${fdt_addr} /boot/${fdtimage}\0"

Signature · 1 line

1.9.2.468.g3f0c02a

Marek Vasut

2015-12-21 23:14 UTC #1 lore raw

PATCH 1/1 arm: socfpga: cyclone5_socdk: Update qspiboot to use UBIFS

Quoted 18 lines · Chin Liang See

Update the qspiboot console command to use UBIFS instead of old jffs2 file system.
Signed-off-by Chin Liang See <[email protected]>
Cc Dinh Nguyen <[email protected]>
Cc Dinh Nguyen <[email protected]>
Cc Pavel Machek <[email protected]>
Cc Marek Vasut <[email protected]>
Cc Stefan Roese <[email protected]>
---
 include/configs/socfpga_cyclone5_socdk.h | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
(quoted diff) +0 -0
b/include/configs/socfpga_cyclone5_socdk.h index 61450cb..a0f62ef 100644

include/configs/socfpga_cyclone5_socdk.h line 75

Quoted 9 lines

include/configs/socfpga_cyclone5_socdk.h +1 -4

@@ -71,11 +71,9 @@
 		"load mmc 0:1 ${loadaddr} ${bootimage};" \
 		"load mmc 0:1 ${fdt_addr} ${fdtimage}\0" \
 	"qspiload=sf probe; mtdparts default;run ubiload\0" \
-	"qspiroot=/dev/mtdblock0\0" \
-	"qspirootfstype=jffs2\0" \
 	"qspiboot=setenv bootargs " CONFIG_BOOTARGS \
-		" root=${qspiroot} rw rootfstype=${qspirootfstype};"\
-		"bootm ${loadaddr} - ${fdt_addr}\0" \
+		" ubi.mtd=1,64 root=ubi0:rootfs rw rootfstype=ubifs;"\

Why do you use 1,64 ? Just use /dev/mtdN , no ?

include/configs/socfpga_cyclone5_socdk.h line 79

Quoted 4 lines

include/configs/socfpga_cyclone5_socdk.h +1 -0

+		"bootz ${loadaddr} - ${fdt_addr}\0" \
 	"ubiload=ubi part UBI; ubifsmount ubi0;" \
 		"ubifsload ${loadaddr} /boot/${bootimage};" \
 		"ubifsload ${fdt_addr} /boot/${fdtimage}\0"

Best regards,
Marek Vasut

Chin Liang See

author

2015-12-22 00:32 UTC #2 lore raw

PATCH 1/1 arm: socfpga: cyclone5_socdk: Update qspiboot to use UBIFS

Quoted 25 lines · Marek Vasut

Quoted 24 lines · Chin Liang See
Update the qspiboot console command to use UBIFS instead of old jffs2 file system.
Signed-off-by Chin Liang See <[email protected]>
Cc Dinh Nguyen <[email protected]>
Cc Dinh Nguyen <[email protected]>
Cc Pavel Machek <[email protected]>
Cc Marek Vasut <[email protected]>
Cc Stefan Roese <[email protected]>
---
 include/configs/socfpga_cyclone5_socdk.h | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
(quoted diff) +0 -0
b/include/configs/socfpga_cyclone5_socdk.h index 61450cb..a0f62ef 100644
include/configs/socfpga_cyclone5_socdk.h +0 -2
@@ -71,11 +71,9 @@
 		"load mmc 0:1 ${loadaddr} ${bootimage};" \
 		"load mmc 0:1 ${fdt_addr} ${fdtimage}\0" \
 	"qspiload=sf probe; mtdparts default;run ubiload\0" \
-	"qspiroot=/dev/mtdblock0\0" \
-	"qspirootfstype=jffs2\0" \

Quoted 8 lines

include/configs/socfpga_cyclone5_socdk.h line 77
Quoted 6 lines
include/configs/socfpga_cyclone5_socdk.h +1 -2
 	"qspiboot=setenv bootargs " CONFIG_BOOTARGS \
-		" root=${qspiroot} rw
 rootfstype=${qspirootfstype};"\
-		"bootm ${loadaddr} - ${fdt_addr}\0" \
+		" ubi.mtd=1,64 root=ubi0:rootfs rw
 rootfstype=ubifs;"\
Why do you use 1,64 ? Just use /dev/mtdN , no ?

I tried and Linux claim unknown block. Quick grep the Linux dts and everyone is using similar way where 1 indicate mtd1 and 64 indicate page size.

Thanks
Chin Liang

Quoted 8 lines

include/configs/socfpga_cyclone5_socdk.h line 79
Quoted 5 lines
include/configs/socfpga_cyclone5_socdk.h +1 -0
+		"bootz ${loadaddr} - ${fdt_addr}\0" \
 	"ubiload=ubi part UBI; ubifsmount ubi0;" \
include/configs/socfpga_cyclone5_socdk.h +0 -0
 		"ubifsload ${loadaddr} /boot/${bootimage};" \
 		"ubifsload ${fdt_addr} /boot/${fdtimage}\0"
Best regards,
Marek Vasut

Chin Liang See

author

2015-12-22 00:34 UTC #3 lore raw

PATCH 1/1 arm: socfpga: cyclone5_socdk: Update qspiboot to use UBIFS

Quoted 35 lines · Chin Liang See

Quoted 25 lines · Marek Vasut
Quoted 24 lines · Chin Liang See
Update the qspiboot console command to use UBIFS instead of old jffs2 file system.
Signed-off-by Chin Liang See <[email protected]>
Cc Dinh Nguyen <[email protected]>
Cc Dinh Nguyen <[email protected]>
Cc Pavel Machek <[email protected]>
Cc Marek Vasut <[email protected]>
Cc Stefan Roese <[email protected]>
---
 include/configs/socfpga_cyclone5_socdk.h | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
(quoted diff) +0 -0
b/include/configs/socfpga_cyclone5_socdk.h index 61450cb..a0f62ef 100644
include/configs/socfpga_cyclone5_socdk.h +0 -2
@@ -71,11 +71,9 @@
 		"load mmc 0:1 ${loadaddr} ${bootimage};" \
 		"load mmc 0:1 ${fdt_addr} ${fdtimage}\0" \
 	"qspiload=sf probe; mtdparts default;run ubiload\0" \
-	"qspiroot=/dev/mtdblock0\0" \
-	"qspirootfstype=jffs2\0" \
Quoted 8 lines
include/configs/socfpga_cyclone5_socdk.h line 77
Quoted 6 lines
include/configs/socfpga_cyclone5_socdk.h +1 -2
 	"qspiboot=setenv bootargs " CONFIG_BOOTARGS \
-		" root=${qspiroot} rw
 rootfstype=${qspirootfstype};"\
-		"bootm ${loadaddr} - ${fdt_addr}\0" \
+		" ubi.mtd=1,64 root=ubi0:rootfs rw
 rootfstype=ubifs;"\
Why do you use 1,64 ? Just use /dev/mtdN , no ?

Quoted 3 lines

I tried and Linux claim unknown block. Quick grep the Linux dts and everyone is using similar way where 1 indicate mtd1 and 64 indicate page size.

Let me remove 64 there as its working. I notice most of Linux dts is not specifying this.

Thanks
Chin Liang

Quoted 11 lines

Thanks
Chin Liang
Quoted 7 lines
include/configs/socfpga_cyclone5_socdk.h line 79
Quoted 5 lines
include/configs/socfpga_cyclone5_socdk.h +1 -0
+		"bootz ${loadaddr} - ${fdt_addr}\0" \
 	"ubiload=ubi part UBI; ubifsmount ubi0;" \
include/configs/socfpga_cyclone5_socdk.h +0 -0
 		"ubifsload ${loadaddr} /boot/${bootimage};" \
 		"ubifsload ${fdt_addr} /boot/${fdtimage}\0"
Best regards,

Marek Vasut

2015-12-22 00:34 UTC #4 lore raw

PATCH 1/1 arm: socfpga: cyclone5_socdk: Update qspiboot to use UBIFS

In reply to Chin Liang See

Quoted 41 lines · Chin Liang See

Quoted 32 lines · Marek Vasut
Quoted 31 lines · Chin Liang See
Update the qspiboot console command to use UBIFS instead of old jffs2 file system.
Signed-off-by Chin Liang See <[email protected]>
Cc Dinh Nguyen <[email protected]>
Cc Dinh Nguyen <[email protected]>
Cc Pavel Machek <[email protected]>
Cc Marek Vasut <[email protected]>
Cc Stefan Roese <[email protected]>
---
 include/configs/socfpga_cyclone5_socdk.h | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
(quoted diff) +0 -0
b/include/configs/socfpga_cyclone5_socdk.h index 61450cb..a0f62ef 100644
include/configs/socfpga_cyclone5_socdk.h +0 -2
@@ -71,11 +71,9 @@
 
 		"load mmc 0:1 ${loadaddr} ${bootimage};" \
 		"load mmc 0:1 ${fdt_addr} ${fdtimage}\0" \
 
 	"qspiload=sf probe; mtdparts default;run ubiload\0" \
 
-	"qspiroot=/dev/mtdblock0\0" \
-	"qspirootfstype=jffs2\0" \
 
 	"qspiboot=setenv bootargs " CONFIG_BOOTARGS \
 
Quoted 7 lines
Quoted 5 lines
include/configs/socfpga_cyclone5_socdk.h +0 -1
-		" root=${qspiroot} rw
rootfstype=${qspirootfstype};"\
include/configs/socfpga_cyclone5_socdk.h +1 -1
-		"bootm ${loadaddr} - ${fdt_addr}\0" \
+		" ubi.mtd=1,64 root=ubi0:rootfs rw
rootfstype=ubifs;"\
Why do you use 1,64 ? Just use /dev/mtdN , no ?

Quoted 3 lines

I tried and Linux claim unknown block. Quick grep the Linux dts and everyone is using similar way where 1 indicate mtd1 and 64 indicate page size.

OK, I see. I didn't know you can specify the block size that way, nice :)

Best regards,
Marek Vasut