[U-Boot] [PATCH] socfpga_xxx.h: update socfpga configs to match mmc spl parition change

[Marek Vasut]

On 11/19/2016 10:11 PM, Bill Randle wrote:
> Commit 61520ac4d5545cc8d2e1792092e46ab8043d5f36 changed the default SPL partition
> to p1, which moved the bootimage and rootfs partitions. This patch updates the
> various socfpga_xxx.h config files to match that partition layout when booting
> from mmc.

The tags should be ARM: socfpga:

I think it'd make more sense to extract this common env to
socfpga_common.h instead and then do the necessary changes
(that is, 2-patch series). Keep in mind that not all boards
use the common env though.

> Signed-off-by: Bill Randle <bill.randle at gmail.com>
> Cc: Marek Vasut <marex at denx.de>
> ---
>  include/configs/socfpga_arria5_socdk.h   | 6 +++---
>  include/configs/socfpga_cyclone5_socdk.h | 6 +++---
>  include/configs/socfpga_de0_nano_soc.h   | 6 +++---
>  include/configs/socfpga_sockit.h         | 6 +++---
>  include/configs/socfpga_socrates.h       | 6 +++---
>  include/configs/socfpga_sr1500.h         | 6 +++---
>  6 files changed, 18 insertions(+), 18 deletions(-)
> 
> diff --git a/include/configs/socfpga_arria5_socdk.h b/include/configs/socfpga_arria5_socdk.h
> index 3b0b416..d4cb204 100644
> --- a/include/configs/socfpga_arria5_socdk.h
> +++ b/include/configs/socfpga_arria5_socdk.h
> @@ -46,13 +46,13 @@
>  	"fdt_addr=100\0" \
>  	"fdtimage=socfpga.dtb\0" \
>  	"bootm ${loadaddr} - ${fdt_addr}\0" \
> -	"mmcroot=/dev/mmcblk0p2\0" \
> +	"mmcroot=/dev/mmcblk0p3\0" \
>  	"mmcboot=setenv bootargs " CONFIG_BOOTARGS \
>  		" root=${mmcroot} rw rootwait;" \
>  		"bootz ${loadaddr} - ${fdt_addr}\0" \
>  	"mmcload=mmc rescan;" \
> -		"load mmc 0:1 ${loadaddr} ${bootimage};" \
> -		"load mmc 0:1 ${fdt_addr} ${fdtimage}\0" \
> +		"load mmc 0:2 ${loadaddr} ${bootimage};" \
> +		"load mmc 0:2 ${fdt_addr} ${fdtimage}\0" \
>  	"qspiload=sf probe && mtdparts default && run ubiload\0" \
>  	"qspiboot=setenv bootargs " CONFIG_BOOTARGS \
>  		" ubi.mtd=1,64 root=ubi0:rootfs rw rootfstype=ubifs;"\
> diff --git a/include/configs/socfpga_cyclone5_socdk.h b/include/configs/socfpga_cyclone5_socdk.h
> index 7ced6a6..3cd3b5b 100644
> --- a/include/configs/socfpga_cyclone5_socdk.h
> +++ b/include/configs/socfpga_cyclone5_socdk.h
> @@ -46,13 +46,13 @@
>  	"fdt_addr=100\0" \
>  	"fdtimage=socfpga.dtb\0" \
>  	"bootm ${loadaddr} - ${fdt_addr}\0" \
> -	"mmcroot=/dev/mmcblk0p2\0" \
> +	"mmcroot=/dev/mmcblk0p3\0" \
>  	"mmcboot=setenv bootargs " CONFIG_BOOTARGS \
>  		" root=${mmcroot} rw rootwait;" \
>  		"bootz ${loadaddr} - ${fdt_addr}\0" \
>  	"mmcload=mmc rescan;" \
> -		"load mmc 0:1 ${loadaddr} ${bootimage};" \
> -		"load mmc 0:1 ${fdt_addr} ${fdtimage}\0" \
> +		"load mmc 0:2 ${loadaddr} ${bootimage};" \
> +		"load mmc 0:2 ${fdt_addr} ${fdtimage}\0" \
>  	"qspiload=sf probe && mtdparts default && run ubiload\0" \
>  	"qspiboot=setenv bootargs " CONFIG_BOOTARGS \
>  		" ubi.mtd=1,64 root=ubi0:rootfs rw rootfstype=ubifs;"\
> diff --git a/include/configs/socfpga_de0_nano_soc.h b/include/configs/socfpga_de0_nano_soc.h
> index 6b9546e..322e678 100644
> --- a/include/configs/socfpga_de0_nano_soc.h
> +++ b/include/configs/socfpga_de0_nano_soc.h
> @@ -41,13 +41,13 @@
>  	"fdt_addr=100\0" \
>  	"fdtimage=socfpga.dtb\0" \
>  	"bootm ${loadaddr} - ${fdt_addr}\0" \
> -	"mmcroot=/dev/mmcblk0p2\0" \
> +	"mmcroot=/dev/mmcblk0p3\0" \
>  	"mmcboot=setenv bootargs " CONFIG_BOOTARGS \
>  		" root=${mmcroot} rw rootwait;" \
>  		"bootz ${loadaddr} - ${fdt_addr}\0" \
>  	"mmcload=mmc rescan;" \
> -		"load mmc 0:1 ${loadaddr} ${bootimage};" \
> -		"load mmc 0:1 ${fdt_addr} ${fdtimage}\0" \
> +		"load mmc 0:2 ${loadaddr} ${bootimage};" \
> +		"load mmc 0:2 ${fdt_addr} ${fdtimage}\0" \
>  
>  /* The rest of the configuration is shared */
>  #include <configs/socfpga_common.h>
> diff --git a/include/configs/socfpga_sockit.h b/include/configs/socfpga_sockit.h
> index 3fceb31..ccbf56c 100644
> --- a/include/configs/socfpga_sockit.h
> +++ b/include/configs/socfpga_sockit.h
> @@ -42,13 +42,13 @@
>  	"fdt_addr=100\0" \
>  	"fdtimage=socfpga.dtb\0" \
>  	"bootm ${loadaddr} - ${fdt_addr}\0" \
> -	"mmcroot=/dev/mmcblk0p2\0" \
> +	"mmcroot=/dev/mmcblk0p3\0" \
>  	"mmcboot=setenv bootargs " CONFIG_BOOTARGS \
>  		" root=${mmcroot} rw rootwait;" \
>  		"bootz ${loadaddr} - ${fdt_addr}\0" \
>  	"mmcload=mmc rescan;" \
> -		"load mmc 0:1 ${loadaddr} ${bootimage};" \
> -		"load mmc 0:1 ${fdt_addr} ${fdtimage}\0" \
> +		"load mmc 0:2 ${loadaddr} ${bootimage};" \
> +		"load mmc 0:2 ${fdt_addr} ${fdtimage}\0" \
>  	"qspiload=sf probe && mtdparts default && run ubiload\0" \
>  	"qspiboot=setenv bootargs " CONFIG_BOOTARGS \
>  		" ubi.mtd=1,64 root=ubi0:rootfs rw rootfstype=ubifs;"\
> diff --git a/include/configs/socfpga_socrates.h b/include/configs/socfpga_socrates.h
> index c9473df..0c29e31 100644
> --- a/include/configs/socfpga_socrates.h
> +++ b/include/configs/socfpga_socrates.h
> @@ -42,13 +42,13 @@
>  	"fdt_addr=100\0" \
>  	"fdtimage=socfpga.dtb\0" \
>  	"bootm ${loadaddr} - ${fdt_addr}\0" \
> -	"mmcroot=/dev/mmcblk0p2\0" \
> +	"mmcroot=/dev/mmcblk0p3\0" \
>  	"mmcboot=setenv bootargs " CONFIG_BOOTARGS \
>  		" root=${mmcroot} rw rootwait;" \
>  		"bootz ${loadaddr} - ${fdt_addr}\0" \
>  	"mmcload=mmc rescan;" \
> -		"load mmc 0:1 ${loadaddr} ${bootimage};" \
> -		"load mmc 0:1 ${fdt_addr} ${fdtimage}\0" \
> +		"load mmc 0:2 ${loadaddr} ${bootimage};" \
> +		"load mmc 0:2 ${fdt_addr} ${fdtimage}\0" \
>  	"qspiroot=/dev/mtdblock0\0" \
>  	"qspirootfstype=jffs2\0" \
>  	"qspiboot=setenv bootargs " CONFIG_BOOTARGS \
> diff --git a/include/configs/socfpga_sr1500.h b/include/configs/socfpga_sr1500.h
> index 0407f03..232460b 100644
> --- a/include/configs/socfpga_sr1500.h
> +++ b/include/configs/socfpga_sr1500.h
> @@ -42,13 +42,13 @@
>  	"fdtimage=socfpga.dtb\0" \
>  		"fsloadcmd=ext2load\0" \
>  	"bootm ${loadaddr} - ${fdt_addr}\0" \
> -	"mmcroot=/dev/mmcblk0p2\0" \
> +	"mmcroot=/dev/mmcblk0p3\0" \
>  	"mmcboot=setenv bootargs " CONFIG_BOOTARGS \
>  		" root=${mmcroot} rw rootwait;" \
>  		"bootz ${loadaddr} - ${fdt_addr}\0" \
>  	"mmcload=mmc rescan;" \
> -		"load mmc 0:1 ${loadaddr} ${bootimage};" \
> -		"load mmc 0:1 ${fdt_addr} ${fdtimage}\0" \
> +		"load mmc 0:2 ${loadaddr} ${bootimage};" \
> +		"load mmc 0:2 ${fdt_addr} ${fdtimage}\0" \
>  	"qspiload=sf probe && mtdparts default && run ubiload\0" \
>  	"qspiboot=setenv bootargs " CONFIG_BOOTARGS \
>  		" ubi.mtd=1,64 root=ubi0:rootfs rw rootfstype=ubifs;"\
> 


-- 
Best regards,
Marek Vasut