[U-Boot] [PATCH 2/7] arm: socfpga: update cyclone5 socdk default environment

[Marek Vasut]

On 01/21/2017 06:31 PM, Dalon Westergreen wrote:
> From: Dalon Westergreen <dalon.westergreen at intel.com>
> 
> The default values for CONFIG_SYS_MMCSD_FS_BOOT_PARTITION
> and CONFIG_SYS_MMCSD_FS_OS_PARTITION have changed and as
> as result the default uboot environment for this board
> needs updating.  This sets the default envirnment to
> use the CONFIG_SYS_MMCSD_FS_BOOT_PARTITION and
> CONFIG_SYS_MMCSD_FS_OS_PARTITION configs for the boot
> and os partitions.
> 
> Also set the default fdtimage value to match the
> devicetree name in the linux kernel for this board.
> 
> Signed-off-by: Dalon Westergreen <dalon.westergreen at intel.com>

Acked-by: Marek Vasut <marex at denx.de>

but please see my comment on 1/7

> ---
>  include/configs/socfpga_cyclone5_socdk.h | 10 ++++++----
>  1 file changed, 6 insertions(+), 4 deletions(-)
> 
> diff --git a/include/configs/socfpga_cyclone5_socdk.h b/include/configs/socfpga_cyclone5_socdk.h
> index 7ced6a6..94355ce 100644
> --- a/include/configs/socfpga_cyclone5_socdk.h
> +++ b/include/configs/socfpga_cyclone5_socdk.h
> @@ -44,15 +44,17 @@
>  		"bootm ${loadaddr} - ${fdt_addr}\0" \
>  	"bootimage=zImage\0" \
>  	"fdt_addr=100\0" \
> -	"fdtimage=socfpga.dtb\0" \
> +	"fdtimage=socfpga_cyclone5_socdk.dtb\0" \
>  	"bootm ${loadaddr} - ${fdt_addr}\0" \
> -	"mmcroot=/dev/mmcblk0p2\0" \
> +	"mmc_boot=" __stringify(CONFIG_SYS_MMCSD_FS_BOOT_PARTITION) "\0" \
> +	"mmc_os=" __stringify(CONFIG_SYS_MMCSD_FS_OS_PARTITION) "\0" \
> +	"mmcroot=/dev/mmcblk0p${mmc_os}\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:${mmc_boot} ${loadaddr} ${bootimage};" \
> +		"load mmc 0:${mmc_boot} ${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