From cbc67000af213cb201eeecff05e09fd4cba75883 Mon Sep 17 00:00:00 2001 From: Ming Liu Date: Wed, 1 Sep 2021 20:08:28 +0200 Subject: colibri-imx7: move CONFIG_BOOTCOMMAND from header to defconfig Move CONFIG_BOOTCOMMAND definition from colibri_imx7.h to colibri_imx7_defconfig, to be more flexible, for instance, it could be overridden by merge_config.sh script. Signed-off-by: Ming Liu --- configs/colibri_imx7_defconfig | 3 ++- include/configs/colibri_imx7.h | 2 -- 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 -- cgit v1.2.3