[U-Boot] [PATCH 5/7] sunxi-common.h: Use new generic $bootcmd

[Hans de Goede]

Hi,
On 08/01/2014 09:46 AM, Hans de Goede wrote:
> Use the new standard bootcmd from <config_distro_bootcmd.h>.

Note this applies on top of Stephen Warren's
"[PATCH 1/3] config: introduce a generic $bootcmd"

Regards,

Hans


> 
> Signed-off-by: Hans de Goede <hdegoede at redhat.com>
> ---
>  include/configs/sunxi-common.h | 27 ++++++++++++++++++++++++---
>  1 file changed, 24 insertions(+), 3 deletions(-)
> 
> diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
> index 4c712f3..f5a702a 100644
> --- a/include/configs/sunxi-common.h
> +++ b/include/configs/sunxi-common.h
> @@ -123,9 +123,6 @@
>  #define CONFIG_ENV_OFFSET		(544 << 10) /* (8 + 24 + 512) KiB */
>  #define CONFIG_ENV_SIZE			(128 << 10)	/* 128 KiB */
>  
> -#define CONFIG_EXTRA_ENV_SETTINGS \
> -	"bootm_size=0x10000000\0"
> -
>  #include <config_cmd_default.h>
>  #undef CONFIG_CMD_FPGA
>  
> @@ -219,6 +216,30 @@
>  
>  #ifndef CONFIG_SPL_BUILD
>  #include <config_distro_defaults.h>
> +
> +#ifdef CONFIG_AHCI
> +#define BOOT_TARGET_DEVICES(func) \
> +	func(MMC, mmc, 0) \
> +	func(SCSI, scsi, 0) \
> +	func(USB, usb, 0) \
> +	func(PXE, pxe, na) \
> +	func(DHCP, dhcp, na)
> +#else
> +#define BOOT_TARGET_DEVICES(func) \
> +	func(MMC, mmc, 0) \
> +	func(USB, usb, 0) \
> +	func(PXE, pxe, na) \
> +	func(DHCP, dhcp, na)
> +#endif
> +
> +#include <config_distro_bootcmd.h>
> +
> +#define CONFIG_EXTRA_ENV_SETTINGS \
> +	"bootm_size=0x10000000\0" \
> +	BOOTENV
> +
> +#else /* ifndef CONFIG_SPL_BUILD */
> +#define CONFIG_EXTRA_ENV_SETTINGS
>  #endif
>  
>  #endif /* _SUNXI_COMMON_CONFIG_H */
>