[[PATCH] colibri-imx6ull: move CONFIG_BOOTCOMMAND from header to defconfig

[Marcel Ziswiler]

On Wed, 2021-09-01 at 16:33 +0200, liu.ming50 at gmail.com wrote:
> From: Ming Liu <liu.ming50 at gmail.com>

Please note that we do have a patch set introducing Colibri iMX6ULL 1GB (eMMC) support [1] in-flight and you
likely would need to re-base on top of that one. Thanks!

[1] https://marc.info/?l=u-boot&m=162911970822560

> Move CONFIG_BOOTCOMMAND definition from colibri-imx6ull.h to
> colibri-imx6ull_defconfig, to be more flexible, for instance, it could
> be overridden by merge_config.sh script.
> 
> Signed-off-by: Ming Liu <liu.ming50 at gmail.com>
> ---
>  configs/colibri-imx6ull_defconfig | 3 ++-
>  include/configs/colibri-imx6ull.h | 3 ---
>  2 files changed, 2 insertions(+), 4 deletions(-)
> 
> diff --git a/configs/colibri-imx6ull_defconfig b/configs/colibri-imx6ull_defconfig
> index 739eea7c07..17e3aa65f9 100644
> --- a/configs/colibri-imx6ull_defconfig
> +++ b/configs/colibri-imx6ull_defconfig
> @@ -14,7 +14,8 @@ CONFIG_DISTRO_DEFAULTS=y
>  CONFIG_FIT=y
>  CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/toradex/colibri-imx6ull/imximage.cfg,IMX_NAND"
>  CONFIG_BOOTDELAY=1
> -# CONFIG_USE_BOOTCOMMAND is not set
> +CONFIG_USE_BOOTCOMMAND=y
> +CONFIG_BOOTCOMMAND="run ubiboot; echo; echo ubiboot failed; run distro_bootcmd;"
>  CONFIG_USE_PREBOOT=y
>  CONFIG_PREBOOT="setenv fdtfile imx6ull-colibri${variant}-${fdt_board}.dtb"
>  # CONFIG_CONSOLE_MUX is not set
> diff --git a/include/configs/colibri-imx6ull.h b/include/configs/colibri-imx6ull.h
> index 2fa3485173..304f88d8d7 100644
> --- a/include/configs/colibri-imx6ull.h
> +++ b/include/configs/colibri-imx6ull.h
> @@ -66,9 +66,6 @@
>                 "ubi read ${fdt_addr_r} dtb && " \
>                 "run fdt_fixup && bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \
>  
> -/* Run Distro Boot script if ubiboot fails */
> -#define CONFIG_BOOTCOMMAND "run ubiboot || run distro_bootcmd;"
> -
>  #define BOOT_TARGET_DEVICES(func) \
>         func(MMC, mmc, 0) \
>         func(USB, usb, 0) \