diff options
author | Tom Rini | 2016-06-13 09:45:14 -0400 |
---|---|---|
committer | Tom Rini | 2016-06-17 09:34:49 -0400 |
commit | 7802ce910ba17a962d90b60b5e998e40d5a08067 (patch) | |
tree | 5cca3c51f6420d202d36d363b28603b3a57af1d3 /configs/cm_fx6_defconfig | |
parent | 5e4e87418e0f0e62854fe6c38736e2ee771ec3a7 (diff) |
configs: Re-sync BOOTDELAY changes
With updated moveconfig.py and an better default, re-generate
the migration of BOOTDELAY to the defconfig.
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'configs/cm_fx6_defconfig')
-rw-r--r-- | configs/cm_fx6_defconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/configs/cm_fx6_defconfig b/configs/cm_fx6_defconfig index 41937645f4c..f01a6dd509b 100644 --- a/configs/cm_fx6_defconfig +++ b/configs/cm_fx6_defconfig @@ -4,6 +4,7 @@ CONFIG_TARGET_CM_FX6=y CONFIG_SPL=y CONFIG_OF_BOARD_SETUP=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6QDL,SPL" +CONFIG_BOOTDELAY=3 CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="CM-FX6 # " CONFIG_CMD_BOOTZ=y |