diff mbox

[U-Boot] arm: socfpga: cyclone5_socdk: Update qspiboot to use UBIFS

Message ID 1450714097-3499-1-git-send-email-clsee@altera.com
State Superseded
Delegated to: Marek Vasut
Headers show

Commit Message

Chin Liang See Dec. 21, 2015, 4:08 p.m. UTC
Update the qspiboot console command to use UBIFS instead
of old jffs2 file system.

Signed-off-by: Chin Liang See <clsee@altera.com>
Cc: Dinh Nguyen <dinguyen@opensource.altera.com>
Cc: Dinh Nguyen <dinh.linux@gmail.com>
Cc: Pavel Machek <pavel@denx.de>
Cc: Marek Vasut <marex@denx.de>
Cc: Stefan Roese <sr@denx.de>
---
 include/configs/socfpga_cyclone5_socdk.h | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

Comments

Marek Vasut Dec. 21, 2015, 11:14 p.m. UTC | #1
On Monday, December 21, 2015 at 05:08:17 PM, Chin Liang See wrote:
> Update the qspiboot console command to use UBIFS instead
> of old jffs2 file system.
> 
> Signed-off-by: Chin Liang See <clsee@altera.com>
> Cc: Dinh Nguyen <dinguyen@opensource.altera.com>
> Cc: Dinh Nguyen <dinh.linux@gmail.com>
> Cc: Pavel Machek <pavel@denx.de>
> Cc: Marek Vasut <marex@denx.de>
> Cc: Stefan Roese <sr@denx.de>
> ---
>  include/configs/socfpga_cyclone5_socdk.h | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/include/configs/socfpga_cyclone5_socdk.h
> b/include/configs/socfpga_cyclone5_socdk.h index 61450cb..a0f62ef 100644
> --- a/include/configs/socfpga_cyclone5_socdk.h
> +++ b/include/configs/socfpga_cyclone5_socdk.h
> @@ -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 ?

> +		"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 Dec. 22, 2015, 12:32 a.m. UTC | #2
On Tue, 2015-12-22 at 00:14 +0100, Marek Vasut wrote:
> On Monday, December 21, 2015 at 05:08:17 PM, Chin Liang See wrote:
> > Update the qspiboot console command to use UBIFS instead
> > of old jffs2 file system.
> > 
> > Signed-off-by: Chin Liang See <clsee@altera.com>
> > Cc: Dinh Nguyen <dinguyen@opensource.altera.com>
> > Cc: Dinh Nguyen <dinh.linux@gmail.com>
> > Cc: Pavel Machek <pavel@denx.de>
> > Cc: Marek Vasut <marex@denx.de>
> > Cc: Stefan Roese <sr@denx.de>
> > ---
> >  include/configs/socfpga_cyclone5_socdk.h | 6 ++----
> >  1 file changed, 2 insertions(+), 4 deletions(-)
> > 
> > diff --git a/include/configs/socfpga_cyclone5_socdk.h
> > b/include/configs/socfpga_cyclone5_socdk.h index 61450cb..a0f62ef
> > 100644
> > --- a/include/configs/socfpga_cyclone5_socdk.h
> > +++ b/include/configs/socfpga_cyclone5_socdk.h
> > @@ -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 ?

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

> 
> > +		"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 Dec. 22, 2015, 12:34 a.m. UTC | #3
On Tue, 2015-12-22 at 08:32 +0800, Chin Liang See wrote:
> On Tue, 2015-12-22 at 00:14 +0100, Marek Vasut wrote:
> > On Monday, December 21, 2015 at 05:08:17 PM, Chin Liang See wrote:
> > > Update the qspiboot console command to use UBIFS instead
> > > of old jffs2 file system.
> > > 
> > > Signed-off-by: Chin Liang See <clsee@altera.com>
> > > Cc: Dinh Nguyen <dinguyen@opensource.altera.com>
> > > Cc: Dinh Nguyen <dinh.linux@gmail.com>
> > > Cc: Pavel Machek <pavel@denx.de>
> > > Cc: Marek Vasut <marex@denx.de>
> > > Cc: Stefan Roese <sr@denx.de>
> > > ---
> > >  include/configs/socfpga_cyclone5_socdk.h | 6 ++----
> > >  1 file changed, 2 insertions(+), 4 deletions(-)
> > > 
> > > diff --git a/include/configs/socfpga_cyclone5_socdk.h
> > > b/include/configs/socfpga_cyclone5_socdk.h index 61450cb..a0f62ef
> > > 100644
> > > --- a/include/configs/socfpga_cyclone5_socdk.h
> > > +++ b/include/configs/socfpga_cyclone5_socdk.h
> > > @@ -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 ?
> 
> 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

> 
> Thanks
> Chin Liang
> 
> > 
> > > +		"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 Dec. 22, 2015, 12:34 a.m. UTC | #4
On Tuesday, December 22, 2015 at 01:32:26 AM, Chin Liang See wrote:
> On Tue, 2015-12-22 at 00:14 +0100, Marek Vasut wrote:
> > On Monday, December 21, 2015 at 05:08:17 PM, Chin Liang See wrote:
> > > Update the qspiboot console command to use UBIFS instead
> > > of old jffs2 file system.
> > > 
> > > Signed-off-by: Chin Liang See <clsee@altera.com>
> > > Cc: Dinh Nguyen <dinguyen@opensource.altera.com>
> > > Cc: Dinh Nguyen <dinh.linux@gmail.com>
> > > Cc: Pavel Machek <pavel@denx.de>
> > > Cc: Marek Vasut <marex@denx.de>
> > > Cc: Stefan Roese <sr@denx.de>
> > > ---
> > > 
> > >  include/configs/socfpga_cyclone5_socdk.h | 6 ++----
> > >  1 file changed, 2 insertions(+), 4 deletions(-)
> > > 
> > > diff --git a/include/configs/socfpga_cyclone5_socdk.h
> > > b/include/configs/socfpga_cyclone5_socdk.h index 61450cb..a0f62ef
> > > 100644
> > > --- a/include/configs/socfpga_cyclone5_socdk.h
> > > +++ b/include/configs/socfpga_cyclone5_socdk.h
> > > @@ -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 ?
> 
> 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
diff mbox

Patch

diff --git a/include/configs/socfpga_cyclone5_socdk.h b/include/configs/socfpga_cyclone5_socdk.h
index 61450cb..a0f62ef 100644
--- a/include/configs/socfpga_cyclone5_socdk.h
+++ b/include/configs/socfpga_cyclone5_socdk.h
@@ -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"