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

[u-boot] / configs / spear310_nand_defconfig

diff --git a/configs/spear310_nand_defconfig b/configs/spear310_nand_defconfig
index 78e8f1045efa8b31dd8ee9b14812abc384e63b34..4737bb5b25880baa8b3d5b1b58e4caf5853d3942 100644 (file)
--- a/configs/spear310_nand_defconfig
+++ b/configs/spear310_nand_defconfig
@@ -8,6 +8,7 @@ CONFIG_USE_BOOTARGS=y
 CONFIG_BOOTARGS="console=ttyAMA0,115200 mem=128M root=/dev/mtdblock7 rootfstype=jffs2"
 CONFIG_SYS_CONSOLE_INFO_QUIET=y
 # CONFIG_DISPLAY_BOARDINFO is not set
+# CONFIG_AUTO_COMPLETE is not set
 CONFIG_CMD_IMLS=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_NAND=y
@@ -23,3 +24,4 @@ CONFIG_NAND=y
 CONFIG_NETDEVICES=y
 CONFIG_PHY_GIGE=y
 CONFIG_ETH_DESIGNWARE=y
+CONFIG_CONS_INDEX=0