[U-Boot] [PATCH 3/8] arm: socfpga: A5 SoCDK use environment in common header

[Marek Vasut]

On 02/18/2017 09:51 PM, Dalon Westergreen wrote:
> This removes the default environment from the A5 socdk headers
> and instead uses the common environment provided in
> socfpga_common.h which now uses distro boot.
> 
> Add support to boot from the custom a2 type partition.
> 
> Change default devicetree name to match devicetree name in
> upstream kernel source.
> 
> Signed-off-by: Dalon Westergreen <dwesterg at gmail.com>
> 
> a5

  ^^ What's this ? :)

> ---
>  configs/socfpga_arria5_defconfig       |  3 +++
>  include/configs/socfpga_arria5_socdk.h | 31 -------------------------------
>  2 files changed, 3 insertions(+), 31 deletions(-)
> 
> diff --git a/configs/socfpga_arria5_defconfig b/configs/socfpga_arria5_defconfig
> index 43c51fe..c7d7f93 100644
> --- a/configs/socfpga_arria5_defconfig
> +++ b/configs/socfpga_arria5_defconfig
> @@ -4,6 +4,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000
>  CONFIG_TARGET_SOCFPGA_ARRIA5_SOCDK=y
>  CONFIG_SPL_STACK_R_ADDR=0x00800000
>  CONFIG_DEFAULT_DEVICE_TREE="socfpga_arria5_socdk"
> +CONFIG_DEFAULT_FDT_FILE="socfpga_arria10_socdk_sdmmc.dtb"

This is A5 SoCDK , not A10 ;-)

>  CONFIG_FIT=y
>  CONFIG_SYS_CONSOLE_IS_IN_ENV=y
>  CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
> @@ -64,3 +65,5 @@ CONFIG_G_DNL_MANUFACTURER="altera"
>  CONFIG_G_DNL_VENDOR_NUM=0x0525
>  CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
>  CONFIG_USE_TINY_PRINTF=y
> +ONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION_TYPE=y
> +CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION_TYPE=0xa2
> diff --git a/include/configs/socfpga_arria5_socdk.h b/include/configs/socfpga_arria5_socdk.h
> index 9b1f753..7222505 100644
> --- a/include/configs/socfpga_arria5_socdk.h
> +++ b/include/configs/socfpga_arria5_socdk.h
> @@ -17,12 +17,6 @@
>  
>  /* Booting Linux */
>  #define CONFIG_BOOTFILE		"zImage"

Is this still needed ? ^

> -#define CONFIG_BOOTARGS		"console=ttyS0," __stringify(CONFIG_BAUDRATE)
> -#ifdef CONFIG_SOCFPGA_VIRTUAL_TARGET
> -#define CONFIG_BOOTCOMMAND	"run ramboot"
> -#else
> -#define CONFIG_BOOTCOMMAND	"run mmcload; run mmcboot"
> -#endif
>  #define CONFIG_LOADADDR		0x01000000
>  #define CONFIG_SYS_LOAD_ADDR	CONFIG_LOADADDR
>  
> @@ -34,31 +28,6 @@
>  
>  #define CONFIG_ENV_IS_IN_MMC
>  
> -/* Extra Environment */
> -#define CONFIG_EXTRA_ENV_SETTINGS \
> -	"verify=n\0" \
> -	"loadaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
> -	"ramboot=setenv bootargs " CONFIG_BOOTARGS ";" \
> -		"bootm ${loadaddr} - ${fdt_addr}\0" \
> -	"bootimage=zImage\0" \
> -	"fdt_addr=100\0" \
> -	"fdtimage=socfpga.dtb\0" \
> -	"bootm ${loadaddr} - ${fdt_addr}\0" \
> -	"mmcroot=/dev/mmcblk0p2\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" \
> -	"qspiload=sf probe && mtdparts default && run ubiload\0" \
> -	"qspiboot=setenv bootargs " CONFIG_BOOTARGS \
> -		" 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"
> -
>  /* The rest of the configuration is shared */
>  #include <configs/socfpga_common.h>
>  
> 


-- 
Best regards,
Marek Vasut