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

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

diff --git a/include/configs/duovero.h b/include/configs/duovero.h
index bb3ba5523aea7266a2a9a1a31c585b56bf0addb6..96644b1fa617760ea9f59b748869c86e047bb8e5 100644 (file)
--- a/include/configs/duovero.h
+++ b/include/configs/duovero.h
@@ -16,41 +16,23 @@
  * High Level Configuration Options
  */
 #define CONFIG_DUOVERO
-#define MACH_TYPE_OMAP4_DUOVERO              4097    /* Until the next sync */
-#define CONFIG_MACH_TYPE                MACH_TYPE_OMAP4_DUOVERO
+#define CONFIG_MACH_TYPE                MACH_TYPE_DUOVERO
 
 #include <configs/ti_omap4_common.h>
 
-#undef CONFIG_SPL_OS_BOOT
-
 #undef CONFIG_SYS_EMIF_PRECALCULATED_TIMING_REGS
 #define CONFIG_SYS_AUTOMATIC_SDRAM_DETECTION
 #define CONFIG_SYS_DEFAULT_LPDDR2_TIMINGS
 
 /* USB UHH support options */
-#define CONFIG_CMD_USB
-#define CONFIG_USB_HOST
-#define CONFIG_USB_EHCI
-#define CONFIG_USB_EHCI_OMAP
-#define CONFIG_USB_STORAGE
-#define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3
-
 #define CONFIG_OMAP_EHCI_PHY1_RESET_GPIO 1
 #define CONFIG_OMAP_EHCI_PHY2_RESET_GPIO 62
 
 #define CONFIG_SYS_ENABLE_PADS_ALL
 
-#define CONFIG_CMD_PING
-#define CONFIG_CMD_DHCP
-
-#define CONFIG_SMC911X
-#define CONFIG_SMC911X_32_BIT
-#define CONFIG_SMC911X_BASE            0x2C000000
-
 /* GPIO */
 
 /* ENV related config options */
-#define CONFIG_ENV_IS_NOWHERE
 
 #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG