Merge git://git.denx.de/u-boot-usb

[platform/kernel/u-boot.git] / configs / x600_defconfig

diff --git a/configs/x600_defconfig b/configs/x600_defconfig
index 7cd239b..8e22a18 100644 (file)
--- a/configs/x600_defconfig
+++ b/configs/x600_defconfig
@@ -1,6 +1,9 @@
-CONFIG_SPL=y
 CONFIG_ARM=y
 CONFIG_TARGET_X600=y
-CONFIG_ETH_DESIGNWARE=y
 CONFIG_NETDEVICES=y
-CONFIG_NET=y
+CONFIG_CMD_NET=y
+CONFIG_SPL=y
+CONFIG_AUTOBOOT_KEYED=y
+CONFIG_AUTOBOOT_PROMPT="Hit SPACE in %d seconds to stop autoboot.\n"
+CONFIG_AUTOBOOT_STOP_STR=" "
+CONFIG_ETH_DESIGNWARE=y