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

[people/ms/u-boot.git] / configs / spear310_usbtty_defconfig

diff --git a/configs/spear310_usbtty_defconfig b/configs/spear310_usbtty_defconfig
index f4bc11827141e66d9bc832f769f5a1341225470b..92d24794f9e2ef27f629b2567e9f806867ff0a4e 100644 (file)
--- a/configs/spear310_usbtty_defconfig
+++ b/configs/spear310_usbtty_defconfig
@@ -3,6 +3,7 @@ CONFIG_TARGET_SPEAR310=y
 CONFIG_IDENT_STRING="-SPEAr"
 CONFIG_SYS_EXTRA_OPTIONS="SPEAR310,USBTTY"
 CONFIG_BOOTDELAY=-1
+CONFIG_SYS_CONSOLE_INFO_QUIET=y
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_CMD_I2C=y
 # CONFIG_CMD_SETEXPR is not set
@@ -10,5 +11,7 @@ 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_ETH_DESIGNWARE=y