diff mbox

[U-Boot,v1] arm: socfpga: Enable load zImage and Linux DTB from QSPI

Message ID 1448505155-3367-1-git-send-email-clsee@altera.com
State Deferred
Delegated to: Marek Vasut
Headers show

Commit Message

Chin Liang See Nov. 26, 2015, 2:32 a.m. UTC
Adding new environment qspiload which will load zImage and
Linux DTB from serial NOR flash. The default flash offset for
the images as below and they are configurable during run time.

- zImage located at 0xa0000 with assuming file size 6MB
- Linux DTB located at 0x50000 with assuming file size 28kB

Please adjust the file size env var if exceeding the default

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_arria5_socdk.h   | 10 +++++++++-
 include/configs/socfpga_cyclone5_socdk.h | 10 +++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

Comments

Stefan Roese Nov. 26, 2015, 6:12 a.m. UTC | #1
On 26.11.2015 03:32, Chin Liang See wrote:
> Adding new environment qspiload which will load zImage and
> Linux DTB from serial NOR flash. The default flash offset for
> the images as below and they are configurable during run time.
>
> - zImage located at 0xa0000 with assuming file size 6MB
> - Linux DTB located at 0x50000 with assuming file size 28kB
>
> Please adjust the file size env var if exceeding the default
>
> 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_arria5_socdk.h   | 10 +++++++++-
>   include/configs/socfpga_cyclone5_socdk.h | 10 +++++++++-
>   2 files changed, 18 insertions(+), 2 deletions(-)
>
> diff --git a/include/configs/socfpga_arria5_socdk.h b/include/configs/socfpga_arria5_socdk.h
> index 91ecbf7..0506336 100644
> --- a/include/configs/socfpga_arria5_socdk.h
> +++ b/include/configs/socfpga_arria5_socdk.h
> @@ -77,9 +77,11 @@
>   	"ramboot=setenv bootargs " CONFIG_BOOTARGS ";" \
>   		"bootm ${loadaddr} - ${fdt_addr}\0" \
>   	"bootimage=zImage\0" \
> +	"bootimagesize=0x600000\0" \
>   	"fdt_addr=100\0" \
>   	"fdtimage=socfpga.dtb\0" \
> -		"fsloadcmd=ext2load\0" \
> +	"fdtimagesize=0x7000\0" \
> +	"fsloadcmd=ext2load\0" \
>   	"bootm ${loadaddr} - ${fdt_addr}\0" \
>   	"mmcroot=/dev/mmcblk0p2\0" \
>   	"mmcboot=setenv bootargs " CONFIG_BOOTARGS \
> @@ -90,6 +92,12 @@
>   		"load mmc 0:1 ${fdt_addr} ${fdtimage}\0" \
>   	"qspiroot=/dev/mtdblock0\0" \
>   	"qspirootfstype=jffs2\0" \
> +	"qspiloadcs=0\0" \
> +	"qspibootimageaddr=0xa0000\0" \
> +	"qspifdtaddr=0x50000\0" \
> +	"qspiload=sf probe ${qspiloadcs};" \
> +		"sf read ${loadaddr} ${qspibootimageaddr} ${bootimagesize};" \
> +		"sf read ${fdt_addr} ${qspifdtaddr} ${fdtimagesize};\0" \
>   	"qspiboot=setenv bootargs " CONFIG_BOOTARGS \
>   		" root=${qspiroot} rw rootfstype=${qspirootfstype};"\
>   		"bootm ${loadaddr} - ${fdt_addr}\0"
> diff --git a/include/configs/socfpga_cyclone5_socdk.h b/include/configs/socfpga_cyclone5_socdk.h
> index b5cf393..d7369ee 100644
> --- a/include/configs/socfpga_cyclone5_socdk.h
> +++ b/include/configs/socfpga_cyclone5_socdk.h
> @@ -77,9 +77,11 @@
>   	"ramboot=setenv bootargs " CONFIG_BOOTARGS ";" \
>   		"bootm ${loadaddr} - ${fdt_addr}\0" \
>   	"bootimage=zImage\0" \
> +	"bootimagesize=0x600000\0" \
>   	"fdt_addr=100\0" \
>   	"fdtimage=socfpga.dtb\0" \
> -		"fsloadcmd=ext2load\0" \
> +	"fdtimagesize=0x7000\0" \
> +	"fsloadcmd=ext2load\0" \
>   	"bootm ${loadaddr} - ${fdt_addr}\0" \
>   	"mmcroot=/dev/mmcblk0p2\0" \
>   	"mmcboot=setenv bootargs " CONFIG_BOOTARGS \
> @@ -90,6 +92,12 @@
>   		"load mmc 0:1 ${fdt_addr} ${fdtimage}\0" \
>   	"qspiroot=/dev/mtdblock0\0" \
>   	"qspirootfstype=jffs2\0" \
> +	"qspiloadcs=0\0" \
> +	"qspibootimageaddr=0xa0000\0" \
> +	"qspifdtaddr=0x50000\0" \
> +	"qspiload=sf probe ${qspiloadcs};" \
> +		"sf read ${loadaddr} ${qspibootimageaddr} ${bootimagesize};" \
> +		"sf read ${fdt_addr} ${qspifdtaddr} ${fdtimagesize};\0" \
>   	"qspiboot=setenv bootargs " CONFIG_BOOTARGS \
>   		" root=${qspiroot} rw rootfstype=${qspirootfstype};"\
>   		"bootm ${loadaddr} - ${fdt_addr}\0"

I know that you didn't introduce this here, but wouldn't it make
sense to switch to the generic FS commands, "load" and "ls" instead
of using the specific ones "ext2load" etc? Especially since EXT2
is a bit deprecated.

Thanks,
Stefan
Pavel Machek Nov. 26, 2015, 2:43 p.m. UTC | #2
Hi!

> Adding new environment qspiload which will load zImage and
> Linux DTB from serial NOR flash. The default flash offset for
> the images as below and they are configurable during run time.
> 
> - zImage located at    0xa0000 with assuming file size 6MB
> - Linux DTB located at 0x50000 with assuming file size 28kB

Hmm. Ok, zImage second, so that it can grow. Makes sense. Not sure if
28kB is not a bit small for DTB. I'd reserve at least 64kB.

> Please adjust the file size env var if exceeding the default
> 
> Signed-off-by: Chin Liang See <clsee@altera.com>
> Cc: Dinh Nguyen <dinguyen@opensource.altera.com>
> Cc: Dinh Nguyen <dinh.linux@gmail.com>

Acked-by: Pavel Machek <pavel@denx.de>

Notice that you sent two patches marked "v1".

Thanks,
								Pavel
Chin Liang See Nov. 27, 2015, 1:24 a.m. UTC | #3
Hi Pavel,

On Thu, 2015-11-26 at 15:43 +0100, Pavel Machek wrote:
> Hi!
> 
> > Adding new environment qspiload which will load zImage and
> > Linux DTB from serial NOR flash. The default flash offset for
> > the images as below and they are configurable during run time.
> > 
> > - zImage located at    0xa0000 with assuming file size 6MB
> > - Linux DTB located at 0x50000 with assuming file size 28kB
> 
> Hmm. Ok, zImage second, so that it can grow. Makes sense. Not sure if
> 28kB is not a bit small for DTB. I'd reserve at least 64kB.

Yup, it can grow up to 64kB as the size for a sector. We used 28KB
mainly for boot time performance.

> 
> > Please adjust the file size env var if exceeding the default
> > 
> > Signed-off-by: Chin Liang See <clsee@altera.com>
> > Cc: Dinh Nguyen <dinguyen@opensource.altera.com>
> > Cc: Dinh Nguyen <dinh.linux@gmail.com>
> 
> Acked-by: Pavel Machek <pavel@denx.de>
> 
> Notice that you sent two patches marked "v1".

Haha too obsess with the -v argument within git format-patch :P

Thanks
Chin Liang

> 
> Thanks,
> 								Pavel
Chin Liang See Nov. 27, 2015, 1:26 a.m. UTC | #4
Hi Stefan,

On Thu, 2015-11-26 at 07:12 +0100, Stefan Roese wrote:
> On 26.11.2015 03:32, Chin Liang See wrote:
> > Adding new environment qspiload which will load zImage and
> > Linux DTB from serial NOR flash. The default flash offset for
> > the images as below and they are configurable during run time.
> > 
> > - zImage located at 0xa0000 with assuming file size 6MB
> > - Linux DTB located at 0x50000 with assuming file size 28kB
> > 
> > Please adjust the file size env var if exceeding the default
> > 
> > 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_arria5_socdk.h   | 10 +++++++++-
> >   include/configs/socfpga_cyclone5_socdk.h | 10 +++++++++-
> >   2 files changed, 18 insertions(+), 2 deletions(-)
> > 
> > diff --git a/include/configs/socfpga_arria5_socdk.h
> > b/include/configs/socfpga_arria5_socdk.h
> > index 91ecbf7..0506336 100644
> > --- a/include/configs/socfpga_arria5_socdk.h
> > +++ b/include/configs/socfpga_arria5_socdk.h
> > @@ -77,9 +77,11 @@
> >   	"ramboot=setenv bootargs " CONFIG_BOOTARGS ";" \
> >   		"bootm ${loadaddr} - ${fdt_addr}\0" \
> >   	"bootimage=zImage\0" \
> > +	"bootimagesize=0x600000\0" \
> >   	"fdt_addr=100\0" \
> >   	"fdtimage=socfpga.dtb\0" \
> > -		"fsloadcmd=ext2load\0" \
> > +	"fdtimagesize=0x7000\0" \
> > +	"fsloadcmd=ext2load\0" \
> >   	"bootm ${loadaddr} - ${fdt_addr}\0" \
> >   	"mmcroot=/dev/mmcblk0p2\0" \
> >   	"mmcboot=setenv bootargs " CONFIG_BOOTARGS \
> > @@ -90,6 +92,12 @@
> >   		"load mmc 0:1 ${fdt_addr} ${fdtimage}\0" \
> >   	"qspiroot=/dev/mtdblock0\0" \
> >   	"qspirootfstype=jffs2\0" \
> > +	"qspiloadcs=0\0" \
> > +	"qspibootimageaddr=0xa0000\0" \
> > +	"qspifdtaddr=0x50000\0" \
> > +	"qspiload=sf probe ${qspiloadcs};" \
> > +		"sf read ${loadaddr} ${qspibootimageaddr}
> > ${bootimagesize};" \
> > +		"sf read ${fdt_addr} ${qspifdtaddr}
> > ${fdtimagesize};\0" \
> >   	"qspiboot=setenv bootargs " CONFIG_BOOTARGS \
> >   		" root=${qspiroot} rw
> > rootfstype=${qspirootfstype};"\
> >   		"bootm ${loadaddr} - ${fdt_addr}\0"
> > diff --git a/include/configs/socfpga_cyclone5_socdk.h
> > b/include/configs/socfpga_cyclone5_socdk.h
> > index b5cf393..d7369ee 100644
> > --- a/include/configs/socfpga_cyclone5_socdk.h
> > +++ b/include/configs/socfpga_cyclone5_socdk.h
> > @@ -77,9 +77,11 @@
> >   	"ramboot=setenv bootargs " CONFIG_BOOTARGS ";" \
> >   		"bootm ${loadaddr} - ${fdt_addr}\0" \
> >   	"bootimage=zImage\0" \
> > +	"bootimagesize=0x600000\0" \
> >   	"fdt_addr=100\0" \
> >   	"fdtimage=socfpga.dtb\0" \
> > -		"fsloadcmd=ext2load\0" \
> > +	"fdtimagesize=0x7000\0" \
> > +	"fsloadcmd=ext2load\0" \
> >   	"bootm ${loadaddr} - ${fdt_addr}\0" \
> >   	"mmcroot=/dev/mmcblk0p2\0" \
> >   	"mmcboot=setenv bootargs " CONFIG_BOOTARGS \
> > @@ -90,6 +92,12 @@
> >   		"load mmc 0:1 ${fdt_addr} ${fdtimage}\0" \
> >   	"qspiroot=/dev/mtdblock0\0" \
> >   	"qspirootfstype=jffs2\0" \
> > +	"qspiloadcs=0\0" \
> > +	"qspibootimageaddr=0xa0000\0" \
> > +	"qspifdtaddr=0x50000\0" \
> > +	"qspiload=sf probe ${qspiloadcs};" \
> > +		"sf read ${loadaddr} ${qspibootimageaddr}
> > ${bootimagesize};" \
> > +		"sf read ${fdt_addr} ${qspifdtaddr}
> > ${fdtimagesize};\0" \
> >   	"qspiboot=setenv bootargs " CONFIG_BOOTARGS \
> >   		" root=${qspiroot} rw
> > rootfstype=${qspirootfstype};"\
> >   		"bootm ${loadaddr} - ${fdt_addr}\0"
> 
> I know that you didn't introduce this here, but wouldn't it make
> sense to switch to the generic FS commands, "load" and "ls" instead
> of using the specific ones "ext2load" etc? Especially since EXT2
> is a bit deprecated.
> 

Yah, we should be using newer ext command. Let me drop another patch to
use load command. Thanks for raising this.

Thanks
Chin Liang


> Thanks,
> Stefan
>
Marek Vasut Nov. 27, 2015, 1:27 a.m. UTC | #5
On Friday, November 27, 2015 at 02:24:49 AM, Chin Liang See wrote:
> Hi Pavel,
> 
> On Thu, 2015-11-26 at 15:43 +0100, Pavel Machek wrote:
> > Hi!
> > 
> > > Adding new environment qspiload which will load zImage and
> > > Linux DTB from serial NOR flash. The default flash offset for
> > > the images as below and they are configurable during run time.
> > > 
> > > - zImage located at    0xa0000 with assuming file size 6MB
> > > - Linux DTB located at 0x50000 with assuming file size 28kB
> > 
> > Hmm. Ok, zImage second, so that it can grow. Makes sense. Not sure if
> > 28kB is not a bit small for DTB. I'd reserve at least 64kB.
> 
> Yup, it can grow up to 64kB as the size for a sector. We used 28KB
> mainly for boot time performance.

So why don't you use UBI on the QSPI NOR ? That way, you'd secure the
binaries against bitrot as well.

Best regards,
Marek Vasut
Chin Liang See Nov. 27, 2015, 1:34 a.m. UTC | #6
Hi Marek,

On Fri, 2015-11-27 at 02:27 +0100, Marek Vasut wrote:
> On Friday, November 27, 2015 at 02:24:49 AM, Chin Liang See wrote:
> > Hi Pavel,
> > 
> > On Thu, 2015-11-26 at 15:43 +0100, Pavel Machek wrote:
> > > Hi!
> > > 
> > > > Adding new environment qspiload which will load zImage and
> > > > Linux DTB from serial NOR flash. The default flash offset for
> > > > the images as below and they are configurable during run time.
> > > > 
> > > > - zImage located at    0xa0000 with assuming file size 6MB
> > > > - Linux DTB located at 0x50000 with assuming file size 28kB
> > > 
> > > Hmm. Ok, zImage second, so that it can grow. Makes sense. Not
> > > sure if
> > > 28kB is not a bit small for DTB. I'd reserve at least 64kB.
> > 
> > Yup, it can grow up to 64kB as the size for a sector. We used 28KB
> > mainly for boot time performance.
> 
> So why don't you use UBI on the QSPI NOR ? That way, you'd secure the
> binaries against bitrot as well.
> 

Good point. Its a nice enhancement as we were using raw access for the
images in NAND and QSPI. Will add a new command for fs support once we
enable the ubifs support in socfpga

Thanks
Chin Liang


> Best regards,
> Marek Vasut
Marek Vasut Nov. 27, 2015, 10:20 a.m. UTC | #7
On Friday, November 27, 2015 at 02:34:27 AM, Chin Liang See wrote:
> Hi Marek,
> 
> On Fri, 2015-11-27 at 02:27 +0100, Marek Vasut wrote:
> > On Friday, November 27, 2015 at 02:24:49 AM, Chin Liang See wrote:
> > > Hi Pavel,
> > > 
> > > On Thu, 2015-11-26 at 15:43 +0100, Pavel Machek wrote:
> > > > Hi!
> > > > 
> > > > > Adding new environment qspiload which will load zImage and
> > > > > Linux DTB from serial NOR flash. The default flash offset for
> > > > > the images as below and they are configurable during run time.
> > > > > 
> > > > > - zImage located at    0xa0000 with assuming file size 6MB
> > > > > - Linux DTB located at 0x50000 with assuming file size 28kB
> > > > 
> > > > Hmm. Ok, zImage second, so that it can grow. Makes sense. Not
> > > > sure if
> > > > 28kB is not a bit small for DTB. I'd reserve at least 64kB.
> > > 
> > > Yup, it can grow up to 64kB as the size for a sector. We used 28KB
> > > mainly for boot time performance.
> > 
> > So why don't you use UBI on the QSPI NOR ? That way, you'd secure the
> > binaries against bitrot as well.
> 
> Good point. Its a nice enhancement as we were using raw access for the
> images in NAND and QSPI. Will add a new command for fs support once we
> enable the ubifs support in socfpga

Why can't this be enabled now then ?

Best regards,
Marek Vasut
Chin Liang See Nov. 27, 2015, 12:07 p.m. UTC | #8
On Fri, 2015-11-27 at 11:20 +0100, Marek Vasut wrote:
> On Friday, November 27, 2015 at 02:34:27 AM, Chin Liang See wrote:
> > Hi Marek,
> > 
> > On Fri, 2015-11-27 at 02:27 +0100, Marek Vasut wrote:
> > > On Friday, November 27, 2015 at 02:24:49 AM, Chin Liang See
> > > wrote:
> > > > Hi Pavel,
> > > > 
> > > > On Thu, 2015-11-26 at 15:43 +0100, Pavel Machek wrote:
> > > > > Hi!
> > > > > 
> > > > > > Adding new environment qspiload which will load zImage and
> > > > > > Linux DTB from serial NOR flash. The default flash offset
> > > > > > for
> > > > > > the images as below and they are configurable during run
> > > > > > time.
> > > > > > 
> > > > > > - zImage located at    0xa0000 with assuming file size 6MB
> > > > > > - Linux DTB located at 0x50000 with assuming file size 28kB
> > > > > 
> > > > > Hmm. Ok, zImage second, so that it can grow. Makes sense. Not
> > > > > sure if
> > > > > 28kB is not a bit small for DTB. I'd reserve at least 64kB.
> > > > 
> > > > Yup, it can grow up to 64kB as the size for a sector. We used
> > > > 28KB
> > > > mainly for boot time performance.
> > > 
> > > So why don't you use UBI on the QSPI NOR ? That way, you'd secure
> > > the
> > > binaries against bitrot as well.
> > 
> > Good point. Its a nice enhancement as we were using raw access for
> > the
> > images in NAND and QSPI. Will add a new command for fs support once
> > we
> > enable the ubifs support in socfpga
> 
> Why can't this be enabled now then ?

Mainly for backward compatibility as customer might have their own
script on programming a blank flash in production. This is the same
where we can do mmc load or a load (with file system).

Thanks
Chin Liang

> 
> Best regards,
> Marek Vasut
Marek Vasut Nov. 27, 2015, 12:11 p.m. UTC | #9
On Friday, November 27, 2015 at 01:07:23 PM, Chin Liang See wrote:
> On Fri, 2015-11-27 at 11:20 +0100, Marek Vasut wrote:
> > On Friday, November 27, 2015 at 02:34:27 AM, Chin Liang See wrote:
> > > Hi Marek,
> > > 
> > > On Fri, 2015-11-27 at 02:27 +0100, Marek Vasut wrote:
> > > > On Friday, November 27, 2015 at 02:24:49 AM, Chin Liang See
> > > > 
> > > > wrote:
> > > > > Hi Pavel,
> > > > > 
> > > > > On Thu, 2015-11-26 at 15:43 +0100, Pavel Machek wrote:
> > > > > > Hi!
> > > > > > 
> > > > > > > Adding new environment qspiload which will load zImage and
> > > > > > > Linux DTB from serial NOR flash. The default flash offset
> > > > > > > for
> > > > > > > the images as below and they are configurable during run
> > > > > > > time.
> > > > > > > 
> > > > > > > - zImage located at    0xa0000 with assuming file size 6MB
> > > > > > > - Linux DTB located at 0x50000 with assuming file size 28kB
> > > > > > 
> > > > > > Hmm. Ok, zImage second, so that it can grow. Makes sense. Not
> > > > > > sure if
> > > > > > 28kB is not a bit small for DTB. I'd reserve at least 64kB.
> > > > > 
> > > > > Yup, it can grow up to 64kB as the size for a sector. We used
> > > > > 28KB
> > > > > mainly for boot time performance.
> > > > 
> > > > So why don't you use UBI on the QSPI NOR ? That way, you'd secure
> > > > the
> > > > binaries against bitrot as well.
> > > 
> > > Good point. Its a nice enhancement as we were using raw access for
> > > the
> > > images in NAND and QSPI. Will add a new command for fs support once
> > > we
> > > enable the ubifs support in socfpga
> > 
> > Why can't this be enabled now then ?
> 
> Mainly for backward compatibility as customer might have their own
> script on programming a blank flash in production. This is the same
> where we can do mmc load or a load (with file system).

Does that imply that we will have to get stuck in the past because some
random customer of some random company might have a random script somewhere? :)

Best regards,
Marek Vasut
Chin Liang See Nov. 27, 2015, 12:16 p.m. UTC | #10
On Fri, 2015-11-27 at 13:11 +0100, Marek Vasut wrote:
> On Friday, November 27, 2015 at 01:07:23 PM, Chin Liang See wrote:
> > On Fri, 2015-11-27 at 11:20 +0100, Marek Vasut wrote:
> > > On Friday, November 27, 2015 at 02:34:27 AM, Chin Liang See
> > > wrote:
> > > > Hi Marek,
> > > > 
> > > > On Fri, 2015-11-27 at 02:27 +0100, Marek Vasut wrote:
> > > > > On Friday, November 27, 2015 at 02:24:49 AM, Chin Liang See
> > > > > 
> > > > > wrote:
> > > > > > Hi Pavel,
> > > > > > 
> > > > > > On Thu, 2015-11-26 at 15:43 +0100, Pavel Machek wrote:
> > > > > > > Hi!
> > > > > > > 
> > > > > > > > Adding new environment qspiload which will load zImage
> > > > > > > > and
> > > > > > > > Linux DTB from serial NOR flash. The default flash
> > > > > > > > offset
> > > > > > > > for
> > > > > > > > the images as below and they are configurable during
> > > > > > > > run
> > > > > > > > time.
> > > > > > > > 
> > > > > > > > - zImage located at    0xa0000 with assuming file size
> > > > > > > > 6MB
> > > > > > > > - Linux DTB located at 0x50000 with assuming file size
> > > > > > > > 28kB
> > > > > > > 
> > > > > > > Hmm. Ok, zImage second, so that it can grow. Makes sense.
> > > > > > > Not
> > > > > > > sure if
> > > > > > > 28kB is not a bit small for DTB. I'd reserve at least
> > > > > > > 64kB.
> > > > > > 
> > > > > > Yup, it can grow up to 64kB as the size for a sector. We
> > > > > > used
> > > > > > 28KB
> > > > > > mainly for boot time performance.
> > > > > 
> > > > > So why don't you use UBI on the QSPI NOR ? That way, you'd
> > > > > secure
> > > > > the
> > > > > binaries against bitrot as well.
> > > > 
> > > > Good point. Its a nice enhancement as we were using raw access
> > > > for
> > > > the
> > > > images in NAND and QSPI. Will add a new command for fs support
> > > > once
> > > > we
> > > > enable the ubifs support in socfpga
> > > 
> > > Why can't this be enabled now then ?
> > 
> > Mainly for backward compatibility as customer might have their own
> > script on programming a blank flash in production. This is the same
> > where we can do mmc load or a load (with file system).
> 
> Does that imply that we will have to get stuck in the past because
> some
> random customer of some random company might have a random script
> somewhere? :)
> 

Haha nope, we still need to advance. Just that we are giving choice for
classic and new :)

Thanks
Chin Liang


> Best regards,
> Marek Vasut
diff mbox

Patch

diff --git a/include/configs/socfpga_arria5_socdk.h b/include/configs/socfpga_arria5_socdk.h
index 91ecbf7..0506336 100644
--- a/include/configs/socfpga_arria5_socdk.h
+++ b/include/configs/socfpga_arria5_socdk.h
@@ -77,9 +77,11 @@ 
 	"ramboot=setenv bootargs " CONFIG_BOOTARGS ";" \
 		"bootm ${loadaddr} - ${fdt_addr}\0" \
 	"bootimage=zImage\0" \
+	"bootimagesize=0x600000\0" \
 	"fdt_addr=100\0" \
 	"fdtimage=socfpga.dtb\0" \
-		"fsloadcmd=ext2load\0" \
+	"fdtimagesize=0x7000\0" \
+	"fsloadcmd=ext2load\0" \
 	"bootm ${loadaddr} - ${fdt_addr}\0" \
 	"mmcroot=/dev/mmcblk0p2\0" \
 	"mmcboot=setenv bootargs " CONFIG_BOOTARGS \
@@ -90,6 +92,12 @@ 
 		"load mmc 0:1 ${fdt_addr} ${fdtimage}\0" \
 	"qspiroot=/dev/mtdblock0\0" \
 	"qspirootfstype=jffs2\0" \
+	"qspiloadcs=0\0" \
+	"qspibootimageaddr=0xa0000\0" \
+	"qspifdtaddr=0x50000\0" \
+	"qspiload=sf probe ${qspiloadcs};" \
+		"sf read ${loadaddr} ${qspibootimageaddr} ${bootimagesize};" \
+		"sf read ${fdt_addr} ${qspifdtaddr} ${fdtimagesize};\0" \
 	"qspiboot=setenv bootargs " CONFIG_BOOTARGS \
 		" root=${qspiroot} rw rootfstype=${qspirootfstype};"\
 		"bootm ${loadaddr} - ${fdt_addr}\0"
diff --git a/include/configs/socfpga_cyclone5_socdk.h b/include/configs/socfpga_cyclone5_socdk.h
index b5cf393..d7369ee 100644
--- a/include/configs/socfpga_cyclone5_socdk.h
+++ b/include/configs/socfpga_cyclone5_socdk.h
@@ -77,9 +77,11 @@ 
 	"ramboot=setenv bootargs " CONFIG_BOOTARGS ";" \
 		"bootm ${loadaddr} - ${fdt_addr}\0" \
 	"bootimage=zImage\0" \
+	"bootimagesize=0x600000\0" \
 	"fdt_addr=100\0" \
 	"fdtimage=socfpga.dtb\0" \
-		"fsloadcmd=ext2load\0" \
+	"fdtimagesize=0x7000\0" \
+	"fsloadcmd=ext2load\0" \
 	"bootm ${loadaddr} - ${fdt_addr}\0" \
 	"mmcroot=/dev/mmcblk0p2\0" \
 	"mmcboot=setenv bootargs " CONFIG_BOOTARGS \
@@ -90,6 +92,12 @@ 
 		"load mmc 0:1 ${fdt_addr} ${fdtimage}\0" \
 	"qspiroot=/dev/mtdblock0\0" \
 	"qspirootfstype=jffs2\0" \
+	"qspiloadcs=0\0" \
+	"qspibootimageaddr=0xa0000\0" \
+	"qspifdtaddr=0x50000\0" \
+	"qspiload=sf probe ${qspiloadcs};" \
+		"sf read ${loadaddr} ${qspibootimageaddr} ${bootimagesize};" \
+		"sf read ${fdt_addr} ${qspifdtaddr} ${fdtimagesize};\0" \
 	"qspiboot=setenv bootargs " CONFIG_BOOTARGS \
 		" root=${qspiroot} rw rootfstype=${qspirootfstype};"\
 		"bootm ${loadaddr} - ${fdt_addr}\0"