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

[u-boot] / configs / spear310_defconfig

diff --git a/configs/spear310_defconfig b/configs/spear310_defconfig
index 3f20387c914da9cc49d6f3d11f3fc82009289c47..283d729e39cbae890aa1695fd2b0b211a49a1df4 100644 (file)
--- a/configs/spear310_defconfig
+++ b/configs/spear310_defconfig
@@ -1,12 +1,26 @@
 CONFIG_ARM=y
 CONFIG_TARGET_SPEAR310=y
-CONFIG_SYS_EXTRA_OPTIONS="spear310"
+CONFIG_SYS_TEXT_BASE=0x00700000
+CONFIG_IDENT_STRING="-SPEAr"
+CONFIG_SYS_EXTRA_OPTIONS="SPEAR310"
 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_AUTO_COMPLETE is not set
+CONFIG_CMD_IMLS=y
 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_ENV_IS_IN_FLASH=y
 CONFIG_SYS_I2C_DW=y
+# CONFIG_MMC is not set
+CONFIG_MTD_NOR_FLASH=y
 CONFIG_NETDEVICES=y
+CONFIG_PHY_GIGE=y
 CONFIG_ETH_DESIGNWARE=y
+CONFIG_CONS_INDEX=0