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

[u-boot] / configs / twister_defconfig

diff --git a/configs/twister_defconfig b/configs/twister_defconfig
index 7bbf78188dba5e1b286652c3cf425298e2854515..dffd8254fbc4ab99421283543cde07ce50628157 100644 (file)
--- a/configs/twister_defconfig
+++ b/configs/twister_defconfig
@@ -3,13 +3,13 @@ CONFIG_ARM=y
 CONFIG_ARCH_OMAP2PLUS=y
 CONFIG_SYS_TEXT_BASE=0x80008000
 CONFIG_TARGET_TWISTER=y
-CONFIG_BOOTDELAY=10
+CONFIG_EMIF4=y
 CONFIG_SPL=y
+CONFIG_BOOTDELAY=10
 # CONFIG_SPL_EXT_SUPPORT is not set
 CONFIG_SPL_OS_BOOT=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="twister => "
-# CONFIG_CMD_IMLS is not set
 CONFIG_CMD_SPL=y
 CONFIG_CMD_SPL_NAND_OFS=0x00800000
 CONFIG_CMD_SPL_WRITE_SIZE=0x400
@@ -27,10 +27,18 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
+CONFIG_MTDIDS_DEFAULT="nand0=omap2-nand.0"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:512k(MLO),1m(u-boot),256k(env1),256k(env2),6m(kernel),-(rootfs)"
 CONFIG_CMD_UBI=y
 CONFIG_ENV_IS_IN_NAND=y
+CONFIG_SYS_OMAP24_I2C_SPEED=400000
 CONFIG_MMC_OMAP_HS=y
 CONFIG_NAND=y
+CONFIG_SYS_NAND_BUSWIDTH_16BIT=y
+CONFIG_SPL_NAND_SIMPLE=y
+CONFIG_NETDEVICES=y
+CONFIG_SMC911X=y
+CONFIG_SMC911X_BASE=0x2C000000
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y