Hi everybody,
On 16.09.21 12:52, 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 <[email protected]>
Reviewed-by: Peng Fan <[email protected]>
Reviewed-by: Igor Opaniuk <[email protected]>
Acked-by: Marcel Ziswiler <[email protected]>
---
I have not applied this, not because I see issue, but because the patch
requires to be rebased and I did not want to do this and merge without
test. Could you just rebase it and repost, I will then merge soon.
Regards,
Stefano
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 a0e85ba23a4..f64b1ca4378 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"
# 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..373d6476ddc 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"
# 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" \
"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" \
--
=====================================================================
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: [email protected]
=====================================================================
