Merge git://www.denx.de/git/u-boot-marvell

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

diff --git a/include/configs/duovero.h b/include/configs/duovero.h
index e68f415c20045da92f8a42d0bbd6dacab8cb093d..b5bd3ba651fde4e242afaff64eba9dfc46ea535d 100644 (file)
--- a/include/configs/duovero.h
+++ b/include/configs/duovero.h
@@ -21,21 +21,15 @@
 
 #include <configs/ti_omap4_common.h>
 
-#undef CONFIG_SPL_OS_BOOT
+#undef CONFIG_EFI_PARTITION
 
 #undef CONFIG_SYS_EMIF_PRECALCULATED_TIMING_REGS
 #define CONFIG_SYS_AUTOMATIC_SDRAM_DETECTION
 #define CONFIG_SYS_DEFAULT_LPDDR2_TIMINGS
 
-#undef CONFIG_SYS_PROMPT
-#define CONFIG_SYS_PROMPT              "duovero # "
-
 /* 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
@@ -43,16 +37,11 @@
 
 #define CONFIG_SYS_ENABLE_PADS_ALL
 
-#define CONFIG_CMD_PING
-#define CONFIG_CMD_DHCP
-#define CONFIG_CMD_NET
-
 #define CONFIG_SMC911X
 #define CONFIG_SMC911X_32_BIT
 #define CONFIG_SMC911X_BASE            0x2C000000
 
 /* GPIO */
-#define CONFIG_CMD_GPIO
 
 /* ENV related config options */
 #define CONFIG_ENV_IS_NOWHERE