On 07.02.22 13:19, 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@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
Thanks, I let CI running again, if nothing is reported it is part of my PR to Tom.
Best regards, Stefano
Changes in v5:
- rebase on top of the latest master (commit b5c5b9a0bee)
Changes in v4:
- add an acked-by record.
Changes in v3:
- fix Peng Fan's e-mail address.
Changes in v2:
fix spaces after semicolon.
add reviewed-by records.
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 8730db2f2c3..bd71e4c32aa 100644 --- 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 7fe2000fff0..43c3b04e312 100644 --- 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 c165f618be9..bbdcab29d8f 100644 --- 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" \diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h index c8e733bc366..1dbc77dde1c 100644 --- 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" \