[U-Boot] [PATCH] ORIGEN: Enhance origen config to be more flexible on boot.

[Guillaume Gardet]

Ping.

Guillaume

Le 19/09/2014 15:32, Guillaume GARDET a écrit :
> This patch enhances the boot of origen board by adding support to ext2, bootz, initrd, bootenv loading and boot script.
> It still keeps the previous mmc load command if boot script fails.
>
> Signed-off-by: Guillaume GARDET <guillaume.gardet at free.fr>
> Cc: Minkyu Kang <mk7.kang at samsung.com>
>
> ---
>   include/configs/origen.h | 35 ++++++++++++++++++++++++++++++++++-
>   1 file changed, 34 insertions(+), 1 deletion(-)
>
> diff --git a/include/configs/origen.h b/include/configs/origen.h
> index 5d24916..2117fe1 100644
> --- a/include/configs/origen.h
> +++ b/include/configs/origen.h
> @@ -61,6 +61,10 @@
>   #undef CONFIG_CMD_PING
>   #define CONFIG_CMD_ELF
>   #define CONFIG_CMD_DHCP
> +#define CONFIG_CMD_EXT2
> +#define CONFIG_CMD_FS_GENERIC
> +#define CONFIG_CMD_BOOTZ
> +#define CONFIG_SUPPORT_RAW_INITRD
>   #undef CONFIG_CMD_NET
>   #undef CONFIG_CMD_NFS
>   
> @@ -68,7 +72,36 @@
>   #define COPY_BL2_FNPTR_ADDR	0x02020030
>   #define CONFIG_SPL_TEXT_BASE	0x02021410
>   
> -#define CONFIG_BOOTCOMMAND	"fatload mmc 0 40007000 uImage; bootm 40007000"
> +#define CONFIG_EXTRA_ENV_SETTINGS \
> +	"loadaddr=0x40007000\0" \
> +	"rdaddr=0x48000000\0" \
> +	"kerneladdr=0x40007000\0" \
> +	"ramdiskaddr=0x48000000\0" \
> +	"console=ttySAC2,115200n8\0" \
> +	"mmcdev=0\0" \
> +	"bootenv=uEnv.txt\0" \
> +	"loadbootenv=load mmc ${mmcdev} ${loadaddr} ${bootenv}\0" \
> +	"importbootenv=echo Importing environment from mmc ...; " \
> +		"env import -t $loadaddr $filesize\0" \
> +	"loadbootscript=load mmc ${mmcdev} ${loadaddr} boot.scr\0" \
> +	"bootscript=echo Running bootscript from mmc${mmcdev} ...; " \
> +		"source ${loadaddr}\0"
> +#define CONFIG_BOOTCOMMAND \
> +	"if mmc rescan; then " \
> +		"echo SD/MMC found on device ${mmcdev}; " \
> +		"if run loadbootenv; then " \
> +			"echo Loaded environment from ${bootenv}; " \
> +			"run importbootenv; " \
> +		"fi; " \
> +		"if test -n $uenvcmd; then " \
> +			"echo Running uenvcmd ...; " \
> +			"run uenvcmd; " \
> +		"fi; " \
> +		"if run loadbootscript; then " \
> +			"run bootscript; " \
> +		"fi; " \
> +	"fi; " \
> +	"load mmc ${mmcdev} ${loadaddr} uImage; bootm ${loadaddr} "
>   
>   #define CONFIG_IDENT_STRING		" for ORIGEN"
>