commit 7802ce910ba17a962d90b60b5e998e40d5a08067
author Tom Rini <trini@konsulko.com> Mon Jun 13 09:45:14 2016 -0400
committer Tom Rini <trini@konsulko.com> Fri Jun 17 09:34:49 2016 -0400
tree 5cca3c51f6420d202d36d363b28603b3a57af1d3
parent 5e4e87418e0f0e62854fe6c38736e2ee771ec3a7

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>

configs/nitrogen6s_defconfig

diff --git a/configs/nitrogen6s_defconfig b/configs/nitrogen6s_defconfig
index daace52..08e91c9 100644
--- a/configs/nitrogen6s_defconfig
+++ b/configs/nitrogen6s_defconfig
@@ -2,6 +2,7 @@
 CONFIG_ARCH_MX6=y
 CONFIG_TARGET_NITROGEN6X=y
 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6s.cfg,MX6S,DDR_MB=512"
+CONFIG_BOOTDELAY=3
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set