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

[u-boot] / configs / spear310_defconfig

diff --git a/configs/spear310_defconfig b/configs/spear310_defconfig
index 2f47557891819e16aadccdb7d5931efaf6083fbe..695ed2fd908130d7f40c916cf61605b0f03ec87e 100644 (file)
--- a/configs/spear310_defconfig
+++ b/configs/spear310_defconfig
@@ -2,6 +2,7 @@ CONFIG_ARM=y
 CONFIG_TARGET_SPEAR310=y
 CONFIG_IDENT_STRING="-SPEAr"
 CONFIG_SYS_EXTRA_OPTIONS="SPEAR310"
+CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_BOOTDELAY=1
 CONFIG_SYS_CONSOLE_INFO_QUIET=y
 # CONFIG_DISPLAY_BOARDINFO is not set
@@ -11,5 +12,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