apalis/colibri_imx6: move setting bootcmd to defconfig

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@foundries.io>
Reviewed-by: Peng Fan <peng.fan@nxp.com>
Reviewed-by: Igor Opaniuk <igor.opaniuk@foundries.io>
Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>

diff --git a/configs/apalis_imx6_defconfig b/configs/apalis_imx6_defconfig
index 8730db2..bd71e4c 100644 (file)
--- a/configs/apalis_imx6_defconfig
+++ b/configs/apalis_imx6_defconfig
@@ -27,6 +27,7 @@ CONFIG_AHCI=y
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_FIT=y
 CONFIG_BOOTDELAY=1
+CONFIG_BOOTCOMMAND="run distro_bootcmd; usb start; setenv stdout serial,vidconsole; setenv stdin serial,usbkbd"
 CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_DISPLAY_BOARDINFO_LATE=y

diff --git a/configs/colibri_imx6_defconfig b/configs/colibri_imx6_defconfig
index 7fe2000..43c3b04 100644 (file)
--- a/configs/colibri_imx6_defconfig
+++ b/configs/colibri_imx6_defconfig
@@ -26,6 +26,7 @@ CONFIG_CMD_HDMIDETECT=y
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_FIT=y
 CONFIG_BOOTDELAY=1
+CONFIG_BOOTCOMMAND="run distro_bootcmd; usb start; setenv stdout serial,vidconsole; setenv stdin serial,usbkbd"
 CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_DISPLAY_BOARDINFO_LATE=y

diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h
index c165f61..bbdcab2 100644 (file)
--- a/include/configs/apalis_imx6.h
+++ b/include/configs/apalis_imx6.h
@@ -108,10 +108,6 @@
 #endif
 #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 vmalloc=400M\0" \

diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h
index c8e733b..1dbc77d 100644 (file)
--- a/include/configs/colibri_imx6.h
+++ b/include/configs/colibri_imx6.h
@@ -92,10 +92,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" \