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

[platform/kernel/u-boot.git] / include / configs / vinco.h

diff --git a/include/configs/vinco.h b/include/configs/vinco.h
index 35fe9de..b79ad5b 100644 (file)
--- a/include/configs/vinco.h
+++ b/include/configs/vinco.h
@@ -57,17 +57,12 @@
 
 #ifdef CONFIG_CMD_MMC
 #define CONFIG_SUPPORT_EMMC_BOOT
-#define CONFIG_MMC
-#define CONFIG_GENERIC_MMC
 #define CONFIG_GENERIC_ATMEL_MCI
 #define ATMEL_BASE_MMCI                        ATMEL_BASE_MCI1
 #define CONFIG_SYS_MMC_CLK_OD          500000
 
 /* For generating MMC partitions */
-#define CONFIG_PARTITION_UUIDS
 #define CONFIG_RANDOM_UUID
-#define CONFIG_EFI_PARTITION
-#define CONFIG_CMD_GPT
 
 #endif
 
@@ -77,7 +72,6 @@
 #define CONFIG_USB_EHCI
 #define CONFIG_USB_EHCI_ATMEL
 #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS     3
-#define CONFIG_USB_STORAGE
 #endif
 
 /* USB device */
@@ -85,10 +79,6 @@
 #define CONFIG_USB_ETH_RNDIS
 #define CONFIG_USBNET_MANUFACTURER      "L+G VInCo"
 
-#if defined(CONFIG_CMD_USB) || defined(CONFIG_CMD_MMC)
-#define CONFIG_DOS_PARTITION
-#endif
-
 /* Ethernet Hardware */
 #define CONFIG_PHY_SMSC
 #define CONFIG_MACB
@@ -150,6 +140,5 @@
        "bootdelay=0\0"
 
 #endif
-#define CONFIG_ZERO_BOOTDELAY_CHECK
 
 #endif