summaryrefslogtreecommitdiff
path: root/configs/colibri-imx6ull_defconfig
diff options
context:
space:
mode:
authorMing Liu <ming.liu@toradex.com>2021-09-01 17:05:35 +0200
committerPhilippe Schenker <philippe.schenker@toradex.com>2021-10-05 11:57:43 +0000
commit1e9685556d26be14d1869a8f2104ee3ad2b089a6 (patch)
tree28812bd62fd929fcc72af2c225a1b7e645aaaacb /configs/colibri-imx6ull_defconfig
parentab862daf5d5a2eebf305c5c125f0463b0ff34161 (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>
Diffstat (limited to 'configs/colibri-imx6ull_defconfig')
-rw-r--r--configs/colibri-imx6ull_defconfig3
1 files changed, 2 insertions, 1 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