summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configs/colibri_imx7_defconfig3
-rw-r--r--include/configs/colibri_imx7.h2
2 files changed, 2 insertions, 3 deletions
diff --git a/configs/colibri_imx7_defconfig b/configs/colibri_imx7_defconfig
index 57fbc7a09a..9aa0387c33 100644
--- a/configs/colibri_imx7_defconfig
+++ b/configs/colibri_imx7_defconfig
@@ -17,7 +17,8 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/toradex/colibri_imx7/imximage.cfg,MX7
CONFIG_USE_PREBOOT=y
CONFIG_PREBOOT="setenv fdtfile ${soc}-colibri-${fdt_board}.dtb "
CONFIG_BOOTDELAY=1
-# CONFIG_USE_BOOTCOMMAND is not set
+CONFIG_USE_BOOTCOMMAND=y
+CONFIG_BOOTCOMMAND="run ubiboot || run distro_bootcmd;"
# CONFIG_CONSOLE_MUX is not set
CONFIG_SYS_CONSOLE_IS_IN_ENV=y
CONFIG_BOARD_LATE_INIT=y
diff --git a/include/configs/colibri_imx7.h b/include/configs/colibri_imx7.h
index 43e7f93829..9532da0429 100644
--- a/include/configs/colibri_imx7.h
+++ b/include/configs/colibri_imx7.h
@@ -122,8 +122,6 @@
#endif /* CONFIG_TDX_EASY_INSTALLER */
#if defined(CONFIG_TARGET_COLIBRI_IMX7_NAND)
-#define CONFIG_BOOTCOMMAND "run ubiboot ; echo ; echo ubiboot failed ; " \
- "run distro_bootcmd;"
#define MODULE_EXTRA_ENV_SETTINGS \
"mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
UBI_BOOTCMD