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

[u-boot] / include / configs / mvebu_armada-8k.h

diff --git a/include/configs/mvebu_armada-8k.h b/include/configs/mvebu_armada-8k.h
index da66d6407e8529fa8b21d9d2aa6cb88f7bff38b2..633218cd940a08f662b9611f7deadd5a9ccf0dd6 100644 (file)
--- a/include/configs/mvebu_armada-8k.h
+++ b/include/configs/mvebu_armada-8k.h
@@ -93,16 +93,10 @@
  * Ethernet Driver configuration
  */
 #define CONFIG_ENV_OVERWRITE   /* ethaddr can be reprogrammed */
-#define CONFIG_PHY_GIGE                /* GbE speed/duplex detect */
 #define CONFIG_ARP_TIMEOUT     200
 #define CONFIG_NET_RETRY_COUNT 50
 
-/* USB 2.0 */
-#define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3
-
-/* USB 3.0 */
-#define CONFIG_USB_MAX_CONTROLLER_COUNT (CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS + \
-                                        3)
+#define CONFIG_USB_MAX_CONTROLLER_COUNT (3 + 3)
 
 /* USB ethernet */
 #define CONFIG_USB_HOST_ETHER
@@ -132,7 +126,6 @@
  */
 #ifdef CONFIG_PCIE_DW_MVEBU
 #define CONFIG_E1000
-#define CONFIG_CMD_PCI
 #endif
 
 #endif /* _CONFIG_MVEBU_ARMADA_8K_H */