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

[people/ms/u-boot.git] / include / configs / warp7.h

diff --git a/include/configs/warp7.h b/include/configs/warp7.h
index 23b6eae5330a78b74928aa93f99b4bd34a7d273c..fe96988be7bd2ac220a9924dcbf504adeff716c3 100644 (file)
--- a/include/configs/warp7.h
+++ b/include/configs/warp7.h
@@ -112,7 +112,6 @@
 
 /* environment organization */
 #define CONFIG_ENV_SIZE                        SZ_8K
-#define CONFIG_ENV_IS_IN_MMC
 
 #define CONFIG_ENV_OFFSET              (8 * SZ_64K)
 #define CONFIG_SYS_FSL_USDHC_NUM       1
@@ -131,16 +130,10 @@
 
 #define CONFIG_USBD_HS
 
-#define CONFIG_USB_FUNCTION_MASS_STORAGE
-
 /* USB Device Firmware Update support */
 #define CONFIG_SYS_DFU_DATA_BUF_SIZE   SZ_16M
 #define DFU_DEFAULT_POLL_TIMEOUT       300
 
-#define CONFIG_USB_ETHER
-#define CONFIG_USB_ETH_CDC
-#define CONFIG_USB_ETH_RNDIS
-#define CONFIG_USBNET_HOST_ADDR                "de:ad:be:af:00:00"
 #define CONFIG_USBNET_DEV_ADDR         "de:ad:be:af:00:01"
 
 #endif