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

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

diff --git a/include/configs/vinco.h b/include/configs/vinco.h
index 7b10e44..e4020d0 100644 (file)
--- a/include/configs/vinco.h
+++ b/include/configs/vinco.h
@@ -13,9 +13,6 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-/* No NOR flash, this definition should be put before common header */
-#define CONFIG_SYS_NO_FLASH
-
 #include "at91-sama5_common.h"
 
 /* The value in the common file is too far away for the VInCo platform */
@@ -57,7 +54,6 @@
 
 #ifdef CONFIG_CMD_MMC
 #define CONFIG_SUPPORT_EMMC_BOOT
-#define CONFIG_GENERIC_MMC
 #define CONFIG_GENERIC_ATMEL_MCI
 #define ATMEL_BASE_MMCI                        ATMEL_BASE_MCI1
 #define CONFIG_SYS_MMC_CLK_OD          500000
@@ -67,14 +63,6 @@
 
 #endif
 
-/* USB */
-
-#ifdef CONFIG_CMD_USB
-#define CONFIG_USB_EHCI
-#define CONFIG_USB_EHCI_ATMEL
-#define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS     3
-#endif
-
 /* USB device */
 #define CONFIG_USB_ETHER
 #define CONFIG_USB_ETH_RNDIS
@@ -109,9 +97,6 @@
                            "mmc read ${oftaddr} ${dtb_offset} ${dtb_blksize};" \
                            "bootz ${loadaddr} -  ${oftaddr}"
 
-#undef CONFIG_BOOTARGS
-#define CONFIG_BOOTARGS            "console=ttyS0,115200 earlyprintk rw root=/dev/mmcblk0p2 rootfstype=ext4 rootwait quiet lpj=1990656"
-
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "kernel_start=0x20000\0" \
        "kernel_size=0x800000\0" \