[PATCH] apalis/colibri_imx6: move setting bootcmd to defconfig

[Marcel Ziswiler]

Hi Oleksandr

Thanks, just one minor nit-pick below.

On Sun, 2021-09-12 at 22:39 +0300, Oleksandr Suvorov wrote:
> Move setting the default boot command to the
> apalis/colibri_imx6_defconfig. It allows replacing the command
> without code modification.
> 
> Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov at foundries.io>
> ---
> 
>  configs/apalis_imx6_defconfig  | 1 +
>  configs/colibri_imx6_defconfig | 1 +
>  include/configs/apalis_imx6.h  | 4 ----
>  include/configs/colibri_imx6.h | 4 ----
>  4 files changed, 2 insertions(+), 8 deletions(-)
> 
> diff --git a/configs/apalis_imx6_defconfig b/configs/apalis_imx6_defconfig
> index a0e85ba23a4..a2e0f8e3936 100644
> --- a/configs/apalis_imx6_defconfig
> +++ b/configs/apalis_imx6_defconfig
> @@ -23,6 +23,7 @@ CONFIG_DISTRO_DEFAULTS=y
>  CONFIG_FIT=y
>  CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
>  CONFIG_BOOTDELAY=1
> +CONFIG_BOOTCOMMAND="run distro_bootcmd;usb start;setenv stdout serial,vidconsole;setenv stdin serial,usbkbd"

I believe, usually we had a space after those semicolons, not?

>  # CONFIG_DISPLAY_BOARDINFO is not set
>  CONFIG_DISPLAY_BOARDINFO_LATE=y
>  CONFIG_BOARD_EARLY_INIT_F=y
> diff --git a/configs/colibri_imx6_defconfig b/configs/colibri_imx6_defconfig
> index 47b1cfb1917..bee4e7edd63 100644
> --- a/configs/colibri_imx6_defconfig
> +++ b/configs/colibri_imx6_defconfig
> @@ -22,6 +22,7 @@ CONFIG_DISTRO_DEFAULTS=y
>  CONFIG_FIT=y
>  CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
>  CONFIG_BOOTDELAY=1
> +CONFIG_BOOTCOMMAND="run distro_bootcmd;usb start;setenv stdout serial,vidconsole;setenv stdin serial,usbkbd"

Ditto.

>  # CONFIG_DISPLAY_BOARDINFO is not set
>  CONFIG_DISPLAY_BOARDINFO_LATE=y
>  CONFIG_BOARD_EARLY_INIT_F=y
> diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h
> index 12de0105c6c..ade479cb943 100644
> --- a/include/configs/apalis_imx6.h
> +++ b/include/configs/apalis_imx6.h
> @@ -133,10 +133,6 @@
>  #endif
>  #define CONFIG_EXTRA_ENV_SETTINGS \
>         BOOTENV \
> -       "bootcmd=run distro_bootcmd ; " \
> -               "usb start ; " \
> -               "setenv stdout serial,vidconsole; " \
> -               "setenv stdin serial,usbkbd\0" \

At least here we definitely did have them (;-p).

>         "boot_file=zImage\0" \
>         "console=ttymxc0\0" \
>         "defargs=enable_wait_mode=off vmalloc=400M\0" \
> diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h
> index 804a144a03e..f91d6b49ea8 100644
> --- a/include/configs/colibri_imx6.h
> +++ b/include/configs/colibri_imx6.h
> @@ -115,10 +115,6 @@
>  #define FDT_FILE "imx6dl-colibri-eval-v3.dtb"
>  #define CONFIG_EXTRA_ENV_SETTINGS \
>         BOOTENV \
> -       "bootcmd=run distro_bootcmd; " \
> -               "usb start ; " \
> -               "setenv stdout serial,vidconsole; " \
> -               "setenv stdin serial,usbkbd\0" \
>         "boot_file=zImage\0" \
>         "console=ttymxc0\0" \
>         "defargs=enable_wait_mode=off galcore.contiguousSize=50331648\0" \

Cheers

Marcel