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/Mele_A1000_defconfig

diff --git a/configs/Mele_A1000_defconfig b/configs/Mele_A1000_defconfig
index 64f2c74..f076e30 100644
--- a/configs/Mele_A1000_defconfig
+++ b/configs/Mele_A1000_defconfig
@@ -1,5 +1,6 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
+CONFIG_MACH_SUN4I=y
 CONFIG_VIDEO_VGA=y
 CONFIG_VIDEO_COMPOSITE=y
 CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-a1000"