summaryrefslogtreecommitdiff
path: root/configs/nitrogen6s1g_defconfig
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2016-06-13 09:45:14 -0400
committerTom Rini <trini@konsulko.com>2016-06-17 09:34:49 -0400
commit7802ce910ba17a962d90b60b5e998e40d5a08067 (patch)
tree5cca3c51f6420d202d36d363b28603b3a57af1d3 /configs/nitrogen6s1g_defconfig
parent5e4e87418e0f0e62854fe6c38736e2ee771ec3a7 (diff)
downloadu-boot-imx-7802ce910ba17a962d90b60b5e998e40d5a08067.zip
u-boot-imx-7802ce910ba17a962d90b60b5e998e40d5a08067.tar.gz
u-boot-imx-7802ce910ba17a962d90b60b5e998e40d5a08067.tar.bz2
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/nitrogen6s1g_defconfig')
-rw-r--r--configs/nitrogen6s1g_defconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/configs/nitrogen6s1g_defconfig b/configs/nitrogen6s1g_defconfig
index fdd444e..bb081a2 100644
--- a/configs/nitrogen6s1g_defconfig
+++ b/configs/nitrogen6s1g_defconfig
@@ -2,6 +2,7 @@ CONFIG_ARM=y
CONFIG_ARCH_MX6=y
CONFIG_TARGET_NITROGEN6X=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6s1g.cfg,MX6S,DDR_MB=1024"
+CONFIG_BOOTDELAY=3
CONFIG_HUSH_PARSER=y
CONFIG_CMD_BOOTZ=y
# CONFIG_CMD_IMLS is not set