mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-09-22 04:30:31 +09:00
colibri_imx7: use preboot for fdtfile evaluation
Enable and set preboot var with fdtfile evaluation. preboot will be checked and run immediately before starting the CONFIG_BOOTDELAY countdown and/or running the auto-boot command resp. entering interactive mode. This provides possibility to use different boot cmds in interactive mode without manual setting fdtfile value, as it it's already evaluated before entering interactive mode. Fixes: a62c60610f("colibri_imx7_emmc: add Colibri iMX7D 1GB (eMMC) module support") Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>
This commit is contained in:
parent
3ab2316a99
commit
327381e8b5
@ -12,6 +12,8 @@ CONFIG_IMX_HAB=y
|
|||||||
CONFIG_DEFAULT_DEVICE_TREE="imx7-colibri-rawnand"
|
CONFIG_DEFAULT_DEVICE_TREE="imx7-colibri-rawnand"
|
||||||
CONFIG_DISTRO_DEFAULTS=y
|
CONFIG_DISTRO_DEFAULTS=y
|
||||||
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/toradex/colibri_imx7/imximage.cfg,MX7D"
|
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/toradex/colibri_imx7/imximage.cfg,MX7D"
|
||||||
|
CONFIG_USE_PREBOOT=y
|
||||||
|
CONFIG_PREBOOT="setenv fdtfile ${soc}-colibri-${fdt_board}.dtb "
|
||||||
CONFIG_BOOTDELAY=1
|
CONFIG_BOOTDELAY=1
|
||||||
# CONFIG_USE_BOOTCOMMAND is not set
|
# CONFIG_USE_BOOTCOMMAND is not set
|
||||||
# CONFIG_CONSOLE_MUX is not set
|
# CONFIG_CONSOLE_MUX is not set
|
||||||
|
@ -14,6 +14,8 @@ CONFIG_DEFAULT_DEVICE_TREE="imx7-colibri-emmc"
|
|||||||
CONFIG_DISTRO_DEFAULTS=y
|
CONFIG_DISTRO_DEFAULTS=y
|
||||||
CONFIG_FIT=y
|
CONFIG_FIT=y
|
||||||
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/toradex/colibri_imx7/imximage.cfg,MX7D"
|
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/toradex/colibri_imx7/imximage.cfg,MX7D"
|
||||||
|
CONFIG_USE_PREBOOT=y
|
||||||
|
CONFIG_PREBOOT="setenv fdtfile ${soc}-colibri-emmc-${fdt_board}.dtb"
|
||||||
CONFIG_BOOTDELAY=1
|
CONFIG_BOOTDELAY=1
|
||||||
# CONFIG_USE_BOOTCOMMAND is not set
|
# CONFIG_USE_BOOTCOMMAND is not set
|
||||||
# CONFIG_CONSOLE_MUX is not set
|
# CONFIG_CONSOLE_MUX is not set
|
||||||
|
@ -118,13 +118,11 @@
|
|||||||
|
|
||||||
#if defined(CONFIG_TARGET_COLIBRI_IMX7_NAND)
|
#if defined(CONFIG_TARGET_COLIBRI_IMX7_NAND)
|
||||||
#define CONFIG_BOOTCOMMAND "run ubiboot ; echo ; echo ubiboot failed ; " \
|
#define CONFIG_BOOTCOMMAND "run ubiboot ; echo ; echo ubiboot failed ; " \
|
||||||
"setenv fdtfile ${soc}-colibri-${fdt_board}.dtb && run distro_bootcmd;"
|
"run distro_bootcmd;"
|
||||||
#define MODULE_EXTRA_ENV_SETTINGS \
|
#define MODULE_EXTRA_ENV_SETTINGS \
|
||||||
"mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
|
"mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
|
||||||
UBI_BOOTCMD
|
UBI_BOOTCMD
|
||||||
#elif defined(CONFIG_TARGET_COLIBRI_IMX7_EMMC)
|
#elif defined(CONFIG_TARGET_COLIBRI_IMX7_EMMC)
|
||||||
#define CONFIG_BOOTCOMMAND \
|
|
||||||
"setenv fdtfile ${soc}-colibri-emmc-${fdt_board}.dtb && run distro_bootcmd;"
|
|
||||||
#define MODULE_EXTRA_ENV_SETTINGS \
|
#define MODULE_EXTRA_ENV_SETTINGS \
|
||||||
"variant=-emmc\0" \
|
"variant=-emmc\0" \
|
||||||
EMMC_ANDROID_BOOTCMD
|
EMMC_ANDROID_BOOTCMD
|
||||||
|
Loading…
Reference in New Issue
Block a user