Merge branch 'master' of git://www.denx.de/git/u-boot-sunxi

[u-boot] / configs / spear310_nand_defconfig

diff --git a/configs/spear310_nand_defconfig b/configs/spear310_nand_defconfig
index 85944c68f15ab053e66444cc8e2002558b138f65..2ae7bf22fbeb56d03d0e78b080998b1d1cfbe7e0 100644 (file)
--- a/configs/spear310_nand_defconfig
+++ b/configs/spear310_nand_defconfig
@@ -1,6 +1,7 @@
 CONFIG_ARM=y
 CONFIG_TARGET_SPEAR310=y
-CONFIG_SYS_EXTRA_OPTIONS="spear310,nand"
+CONFIG_SYS_EXTRA_OPTIONS="SPEAR310,NAND"
+CONFIG_BOOTDELAY=1
 CONFIG_CMD_I2C=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_DHCP=y