diff mbox

[U-Boot] arm: socfpga: Enable ubiload console command

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

Commit Message

Chin Liang See Dec. 21, 2015, 3:36 p.m. UTC
Enabling ubiload command to load kernel image and
device tree from mtd part labeled "UBI". ubiload
command will search the file from folder /boot.

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 | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

Comments

Marek Vasut Dec. 21, 2015, 11:13 p.m. UTC | #1
On Monday, December 21, 2015 at 04:36:14 PM, Chin Liang See wrote:
> Enabling ubiload command to load kernel image and
> device tree from mtd part labeled "UBI". ubiload
> command will search the file from folder /boot.

... directory ... this is not windows.

> 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 | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/include/configs/socfpga_cyclone5_socdk.h
> b/include/configs/socfpga_cyclone5_socdk.h index 3c2e2ae..21b35d8 100644
> --- a/include/configs/socfpga_cyclone5_socdk.h
> +++ b/include/configs/socfpga_cyclone5_socdk.h
> @@ -74,7 +74,10 @@
>  	"qspirootfstype=jffs2\0" \
>  	"qspiboot=setenv bootargs " CONFIG_BOOTARGS \
>  		" root=${qspiroot} rw rootfstype=${qspirootfstype};"\
> -		"bootm ${loadaddr} - ${fdt_addr}\0"
> +		"bootm ${loadaddr} - ${fdt_addr}\0" \
> +	"ubiload=ubi part UBI; ubifsmount ubi0;" \
> +		"ubifsload ${loadaddr} /boot/${bootimage};" \

Use && instead of ;, so the loading won't continue in case of failure.

> +		"ubifsload ${fdt_addr} /boot/${fdtimage}\0"
> 
>  /* The rest of the configuration is shared */
>  #include <configs/socfpga_common.h>

Best regards,
Marek Vasut
Chin Liang See Dec. 22, 2015, 12:21 a.m. UTC | #2
On Tue, 2015-12-22 at 00:13 +0100, Marek Vasut wrote:
> On Monday, December 21, 2015 at 04:36:14 PM, Chin Liang See wrote:
> > Enabling ubiload command to load kernel image and
> > device tree from mtd part labeled "UBI". ubiload
> > command will search the file from folder /boot.
> 
> ... directory ... this is not windows.

haha let me rephrase this :)

> 
> > 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 | 5 ++++-
> >  1 file changed, 4 insertions(+), 1 deletion(-)
> > 
> > diff --git a/include/configs/socfpga_cyclone5_socdk.h
> > b/include/configs/socfpga_cyclone5_socdk.h index 3c2e2ae..21b35d8
> > 100644
> > --- a/include/configs/socfpga_cyclone5_socdk.h
> > +++ b/include/configs/socfpga_cyclone5_socdk.h
> > @@ -74,7 +74,10 @@
> >  	"qspirootfstype=jffs2\0" \
> >  	"qspiboot=setenv bootargs " CONFIG_BOOTARGS \
> >  		" root=${qspiroot} rw
> > rootfstype=${qspirootfstype};"\
> > -		"bootm ${loadaddr} - ${fdt_addr}\0"
> > +		"bootm ${loadaddr} - ${fdt_addr}\0" \
> > +	"ubiload=ubi part UBI; ubifsmount ubi0;" \
> > +		"ubifsload ${loadaddr} /boot/${bootimage};" \
> 
> Use && instead of ;, so the loading won't continue in case of
> failure.

This sound good. Let me update this

Thanks
Chin Liang

> 
> > +		"ubifsload ${fdt_addr} /boot/${fdtimage}\0"
> > 
> >  /* The rest of the configuration is shared */
> >  #include <configs/socfpga_common.h>
> 
> Best regards,
> Marek Vasut
diff mbox

Patch

diff --git a/include/configs/socfpga_cyclone5_socdk.h b/include/configs/socfpga_cyclone5_socdk.h
index 3c2e2ae..21b35d8 100644
--- a/include/configs/socfpga_cyclone5_socdk.h
+++ b/include/configs/socfpga_cyclone5_socdk.h
@@ -74,7 +74,10 @@ 
 	"qspirootfstype=jffs2\0" \
 	"qspiboot=setenv bootargs " CONFIG_BOOTARGS \
 		" root=${qspiroot} rw rootfstype=${qspirootfstype};"\
-		"bootm ${loadaddr} - ${fdt_addr}\0"
+		"bootm ${loadaddr} - ${fdt_addr}\0" \
+	"ubiload=ubi part UBI; ubifsmount ubi0;" \
+		"ubifsload ${loadaddr} /boot/${bootimage};" \
+		"ubifsload ${fdt_addr} /boot/${fdtimage}\0"
 
 /* The rest of the configuration is shared */
 #include <configs/socfpga_common.h>