diff options
| author | Ming Liu <ming.liu@toradex.com> | 2021-09-01 17:05:35 +0200 |
|---|---|---|
| committer | Philippe Schenker <philippe.schenker@toradex.com> | 2021-10-05 11:57:43 +0000 |
| commit | 1e9685556d26be14d1869a8f2104ee3ad2b089a6 (patch) | |
| tree | 28812bd62fd929fcc72af2c225a1b7e645aaaacb | |
| parent | ab862daf5d5a2eebf305c5c125f0463b0ff34161 (diff) | |
colibri-imx6ull: move CONFIG_BOOTCOMMAND from header to defconfig
Move CONFIG_BOOTCOMMAND definition from colibri-imx6ull.h to
colibri-imx6ull_defconfig, to be more flexible, for instance, it could
be overridden by merge_config.sh script.
Signed-off-by: Ming Liu <ming.liu@toradex.com>
| -rw-r--r-- | configs/colibri-imx6ull_defconfig | 3 | ||||
| -rw-r--r-- | include/configs/colibri-imx6ull.h | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/configs/colibri-imx6ull_defconfig b/configs/colibri-imx6ull_defconfig index 90bafd3933..85d67d96b5 100644 --- a/configs/colibri-imx6ull_defconfig +++ b/configs/colibri-imx6ull_defconfig @@ -12,7 +12,8 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/toradex/colibri-imx6ull/imximage.cfg,MX6ULL,IMX_NAND" CONFIG_BOOTDELAY=1 -# CONFIG_USE_BOOTCOMMAND is not set +CONFIG_USE_BOOTCOMMAND=y +CONFIG_BOOTCOMMAND="run ubiboot || run distro_bootcmd;" CONFIG_USE_PREBOOT=y CONFIG_PREBOOT="setenv fdtfile imx6ull-colibri${variant}-${fdt_board}.dtb" CONFIG_SYS_CONSOLE_IS_IN_ENV=y diff --git a/include/configs/colibri-imx6ull.h b/include/configs/colibri-imx6ull.h index 8edce3608e..944c44930e 100644 --- a/include/configs/colibri-imx6ull.h +++ b/include/configs/colibri-imx6ull.h @@ -85,8 +85,6 @@ #endif /* CONFIG_TDX_EASY_INSTALLER */ #if defined(CONFIG_TARGET_COLIBRI_IMX6ULL_NAND) -/* Run Distro Boot script if ubiboot fails */ -#define CONFIG_BOOTCOMMAND "run ubiboot || run distro_bootcmd;" #define DFU_ALT_NAND_INFO "imx6ull-bcb part 0,1;u-boot1 part 0,2;u-boot2 part 0,3;u-boot-env part 0,4;ubi partubi 0,5" #define MODULE_EXTRA_ENV_SETTINGS \ "dfu_alt_info=" DFU_ALT_NAND_INFO "\0" \ |