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

[people/ms/u-boot.git] / configs / cm_t54_defconfig

diff --git a/configs/cm_t54_defconfig b/configs/cm_t54_defconfig
index 956f3581d7d7626f944ded20f0b39f5d0bfe922a..db34b2268a4b7f120e8ee57fdc1c8a4284d55800 100644 (file)
--- a/configs/cm_t54_defconfig
+++ b/configs/cm_t54_defconfig
@@ -5,7 +5,6 @@ CONFIG_TARGET_CM_T54=y
 CONFIG_OMAP_PLATFORM_RESET_TIME_MAX_USEC=16296
 # CONFIG_SPL_NAND_SUPPORT is not set
 CONFIG_OF_BOARD_SETUP=y
-CONFIG_ENV_IS_IN_MMC=y
 CONFIG_BOOTDELAY=3
 CONFIG_SYS_CONSOLE_INFO_QUIET=y
 CONFIG_VERSION_VARIABLE=y
@@ -39,6 +38,7 @@ CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_ISO_PARTITION=y
 CONFIG_EFI_PARTITION=y
+CONFIG_ENV_IS_IN_MMC=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_SCSI=y
 CONFIG_SYS_NS16550=y
@@ -46,5 +46,9 @@ CONFIG_OMAP3_SPI=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y
+CONFIG_USB_HOST_ETHER=y
+CONFIG_USB_ETHER_ASIX=y
+CONFIG_USB_ETHER_MCS7830=y
+CONFIG_USB_ETHER_SMSC95XX=y
 CONFIG_FAT_WRITE=y
 CONFIG_OF_LIBFDT=y