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

[u-boot] / configs / twister_defconfig

diff --git a/configs/twister_defconfig b/configs/twister_defconfig
index f41914094833f3a140f18200cbcb53780d66c425..62d7d17ca9c01a795b26a3dbe1129e732d913424 100644 (file)
--- a/configs/twister_defconfig
+++ b/configs/twister_defconfig
@@ -1,10 +1,12 @@
 CONFIG_ARM=y
+# CONFIG_SYS_THUMB_BUILD is not set
+CONFIG_ARCH_OMAP2PLUS=y
 CONFIG_OMAP34XX=y
-# CONFIG_SPL_EXT_SUPPORT is not set
 CONFIG_TARGET_TWISTER=y
-CONFIG_FIT=y
 CONFIG_BOOTDELAY=10
 CONFIG_SPL=y
+# 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
@@ -21,8 +23,10 @@ CONFIG_CMD_CACHE=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_UBI=y
+CONFIG_MMC_OMAP_HS=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
+CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_ULPI_VIEWPORT_OMAP=y
 CONFIG_USB_ULPI=y
 CONFIG_USB_STORAGE=y