Merge branch 'migrate-various-PHY-options'

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

diff --git a/configs/spear320_nand_defconfig b/configs/spear320_nand_defconfig
index 70b3025fc52811c76b885a66d1f52337646eb0b0..703a2e868c2e302ae699c2d6fdef6aa07ce447aa 100644 (file)
--- a/configs/spear320_nand_defconfig
+++ b/configs/spear320_nand_defconfig
@@ -1,11 +1,34 @@
 CONFIG_ARM=y
 CONFIG_ARM=y

+CONFIG_ARCH_CPU_INIT=y

 CONFIG_TARGET_SPEAR320=y
 CONFIG_TARGET_SPEAR320=y

-CONFIG_SYS_EXTRA_OPTIONS="spear320,nand"
+CONFIG_SYS_TEXT_BASE=0x00700000
+CONFIG_ENV_SIZE=0x2000
+CONFIG_ENV_OFFSET=0x60000
+CONFIG_NR_DRAM_BANKS=1
+CONFIG_IDENT_STRING="-SPEAr"
+CONFIG_SYS_EXTRA_OPTIONS="SPEAR320"
+CONFIG_BOOTDELAY=1
+CONFIG_USE_BOOTARGS=y
+CONFIG_BOOTARGS="console=ttyAMA0,115200 mem=128M root=/dev/mtdblock7 rootfstype=jffs2"
+CONFIG_SYS_CONSOLE_INFO_QUIET=y
+CONFIG_MISC_INIT_R=y
+# CONFIG_DISPLAY_BOARDINFO is not set
+# CONFIG_AUTO_COMPLETE is not set
+CONFIG_CMD_IMLS=y

 CONFIG_CMD_I2C=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_CMD_SETEXPR is not set
 CONFIG_CMD_DHCP=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y

+CONFIG_ENV_IS_IN_NAND=y
+CONFIG_SYS_RELOC_GD_ENV_ADDR=y

 CONFIG_SYS_I2C_DW=y
 CONFIG_SYS_I2C_DW=y

-CONFIG_NETDEVICES=y
+# CONFIG_MMC is not set
+CONFIG_MTD=y
+CONFIG_MTD_NOR_FLASH=y
+CONFIG_MTD_RAW_NAND=y
+CONFIG_PHY_GIGE=y

 CONFIG_ETH_DESIGNWARE=y
 CONFIG_ETH_DESIGNWARE=y

+CONFIG_MII=y
+CONFIG_CONS_INDEX=0