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

[J-u-boot.git] / configs / spear310_usbtty_defconfig

diff --git a/configs/spear310_usbtty_defconfig b/configs/spear310_usbtty_defconfig
index ce3cfca6f793155087e4324d730d44a762faefe5..09a7155b557cb039f6d26931deb02ea8b1fc07c6 100644 (file)
--- a/configs/spear310_usbtty_defconfig
+++ b/configs/spear310_usbtty_defconfig
@@ -1,6 +1,22 @@
 CONFIG_ARM=y
 CONFIG_TARGET_SPEAR310=y
 CONFIG_ARM=y
 CONFIG_TARGET_SPEAR310=y

+CONFIG_IDENT_STRING="-SPEAr"
+CONFIG_SYS_EXTRA_OPTIONS="SPEAR310,USBTTY"
+CONFIG_ENV_IS_IN_FLASH=y
+CONFIG_BOOTDELAY=-1
+CONFIG_USE_BOOTARGS=y
+CONFIG_BOOTARGS="console=ttyAMA0,115200 mem=128M root=/dev/mtdblock3 rootfstype=jffs2"
+CONFIG_SYS_CONSOLE_INFO_QUIET=y
+# CONFIG_DISPLAY_BOARDINFO is not set
+CONFIG_CMD_I2C=y
+CONFIG_CMD_NAND=y
+# CONFIG_CMD_SETEXPR is not set
+CONFIG_CMD_DHCP=y
+CONFIG_CMD_MII=y
+CONFIG_CMD_PING=y
+CONFIG_SYS_I2C_DW=y
+# CONFIG_MMC is not set
+CONFIG_MTD_NOR_FLASH=y

 CONFIG_NETDEVICES=y
 CONFIG_NETDEVICES=y

-CONFIG_SYS_EXTRA_OPTIONS="spear310,usbtty"
-CONFIG_CMD_NET=y
+CONFIG_PHY_GIGE=y

 CONFIG_ETH_DESIGNWARE=y
 CONFIG_ETH_DESIGNWARE=y