Kconfig: USB: Migrate existing USB_EHCI_xxx options

The following options are migrated over fully now:
- USB_EHCI_ATMEL
- USB_EHCI_MARVELL
- USB_EHCI_MX6
- USB_EHCI_MX7
- USB_EHCI_MSM
- USB_EHCI_ZYNQ
- USB_EHCI_GENERIC

This also requires fixing the depends on USB_EHCI_MARVELL as it's used
by Orion5X and Kirkwood as well.

Cc: Marek Vasut <marex@denx.de>
Signed-off-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Marek Vasut <marex@denx.de>

diff --git a/arch/arm/mach-kirkwood/include/mach/config.h b/arch/arm/mach-kirkwood/include/mach/config.h
index b786df0aaf616633810cb9dad1f428ff5492a4d8..c7beb58e800049abb735b91d24a1385afce649c3 100644 (file)
--- a/arch/arm/mach-kirkwood/include/mach/config.h
+++ b/arch/arm/mach-kirkwood/include/mach/config.h
@@ -89,7 +89,6 @@
  * USB/EHCI
  */
 #ifdef CONFIG_CMD_USB
-#define CONFIG_USB_EHCI_MARVELL
 #define CONFIG_EHCI_IS_TDI
 #endif /* CONFIG_CMD_USB */
 

diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index ab2ae737c81ec0c164752aa60ba2860c8017691f..03c15dd6293e3906e5eaee4ace5b952f43b87dfe 100644 (file)
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@ -85,8 +85,8 @@ config USB_EHCI_ATMEL
          Enables support for the on-chip EHCI controller on Atmel chips.
 
 config USB_EHCI_MARVELL
-       bool "Support for MVEBU (AXP / A38x) on-chip EHCI USB controller"
-       depends on ARCH_MVEBU
+       bool "Support for Marvell on-chip EHCI USB controller"
+       depends on ARCH_MVEBU || KIRKWOOD || ORION5X
        default y
        ---help---
          Enables support for the on-chip EHCI controller on MVEBU SoCs.

diff --git a/include/configs/advantech_dms-ba16.h b/include/configs/advantech_dms-ba16.h
index 2a39ae572a6ef86bf4646baf4d945ba16ef101e2..b76f376a042f55a4beefc41852c67f22c5a231f4 100644 (file)
--- a/include/configs/advantech_dms-ba16.h
+++ b/include/configs/advantech_dms-ba16.h
@@ -55,7 +55,6 @@
 #define CONFIG_BOUNCE_BUFFER
 
 /* USB Configs */
-#define CONFIG_USB_EHCI_MX6
 #define CONFIG_USB_STORAGE
 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET

diff --git a/include/configs/aristainetos-common.h b/include/configs/aristainetos-common.h
index 3d5130405dee9d20013c679347c9cb6ab9110f25..7360e11ff14dae8ec682ce6f7baceb3be4474ece 100644 (file)
--- a/include/configs/aristainetos-common.h
+++ b/include/configs/aristainetos-common.h
@@ -202,7 +202,6 @@
 #define CONFIG_RTC_M41T11
 
 /* USB Configs */
-#define CONFIG_USB_EHCI_MX6
 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET       /* For OTG port */
 #define CONFIG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)

diff --git a/include/configs/cgtqmx6eval.h b/include/configs/cgtqmx6eval.h
index 46c297e2423436629676de7427935fc605b0bb39..cad1357f5cfd659bd0489da5433cb1c6b5e23e03 100644 (file)
--- a/include/configs/cgtqmx6eval.h
+++ b/include/configs/cgtqmx6eval.h
@@ -61,7 +61,6 @@
 #define CONFIG_POWER_PFUZE100_I2C_ADDR 0x08
 
 /* USB Configs */
-#define CONFIG_USB_EHCI_MX6
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 #define CONFIG_USB_HOST_ETHER
 #define CONFIG_USB_ETHER_ASIX

diff --git a/include/configs/corvus.h b/include/configs/corvus.h
index 565f8a98b1eb6f3f34005e7caa7fea9082d09fb0..71b428f1f745201f1afb8ddea3025613c2210ebb 100644 (file)
--- a/include/configs/corvus.h
+++ b/include/configs/corvus.h
@@ -96,7 +96,6 @@
 #define CONFIG_AT91_WANTS_COMMON_PHY
 
 /* USB */
-#define CONFIG_USB_EHCI_ATMEL
 #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS     2
 
 /* USB DFU support */

diff --git a/include/configs/ds414.h b/include/configs/ds414.h
index d08c3245870b9d405a1ded70f5ee8d24dcdb5fb6..2c83a716a38436df02f95fb8b8b45fb64aff45f1 100644 (file)
--- a/include/configs/ds414.h
+++ b/include/configs/ds414.h
@@ -74,7 +74,6 @@
 #endif
 
 #if !defined(CONFIG_USB_XHCI_HCD)
-#define CONFIG_USB_EHCI_MARVELL
 #define CONFIG_EHCI_IS_TDI
 #endif
 

diff --git a/include/configs/edminiv2.h b/include/configs/edminiv2.h
index 498a4d15048702e957e3ded6ca77148d3bd12178..d1c7b937e36b60d2fb61c2222850abc42159f1aa 100644 (file)
--- a/include/configs/edminiv2.h
+++ b/include/configs/edminiv2.h
@@ -171,7 +171,6 @@
  * Common USB/EHCI configuration
  */
 #ifdef CONFIG_CMD_USB
-#define CONFIG_USB_EHCI_MARVELL
 #define ORION5X_USB20_HOST_PORT_BASE ORION5X_USB20_PORT0_BASE
 #define CONFIG_SUPPORT_VFAT
 #endif /* CONFIG_CMD_USB */

diff --git a/include/configs/embestmx6boards.h b/include/configs/embestmx6boards.h
index 6b53c008c5ed5de8cf67b59bc23e516e52b6f69d..749a9e3bc17dea40662e54bf295bf0ecc50d44b0 100644 (file)
--- a/include/configs/embestmx6boards.h
+++ b/include/configs/embestmx6boards.h
@@ -35,7 +35,6 @@
 #define CONFIG_SYS_I2C_SPEED           100000
 
 /* USB Configs */
-#define CONFIG_USB_EHCI_MX6
 #define CONFIG_USB_HOST_ETHER
 #define CONFIG_USB_ETHER_ASIX
 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2

diff --git a/include/configs/ge_bx50v3.h b/include/configs/ge_bx50v3.h
index e1fc67e457417c109ca951cc394fc66a09faca9b..198259b3c0d40041f29e7649dd85dc1027c183c3 100644 (file)
--- a/include/configs/ge_bx50v3.h
+++ b/include/configs/ge_bx50v3.h
@@ -68,7 +68,6 @@
 
 /* USB Configs */
 #ifdef CONFIG_USB
-#define CONFIG_USB_EHCI_MX6
 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 #define CONFIG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)

diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h
index cff9fe8fc8967fb8310b32ebc3bb444d57a41450..1c18a380fef679bcfac427d0643d67857308d84b 100644 (file)
--- a/include/configs/gw_ventana.h
+++ b/include/configs/gw_ventana.h
@@ -156,7 +156,6 @@
 #define CONFIG_ARP_TIMEOUT       200UL
 
 /* USB Configs */
-#define CONFIG_USB_EHCI_MX6
 #define CONFIG_USB_HOST_ETHER
 #define CONFIG_USB_ETHER_ASIX
 #define CONFIG_USB_ETHER_SMSC95XX

diff --git a/include/configs/liteboard.h b/include/configs/liteboard.h
index 6a4d2810cf71824b8906fc84e429b60117de01c0..016d54f138c53d56235615fcf0236f3639d15a26 100644 (file)
--- a/include/configs/liteboard.h
+++ b/include/configs/liteboard.h
@@ -137,7 +137,6 @@
 
 /* USB Configs */
 #ifdef CONFIG_CMD_USB
-#define CONFIG_USB_EHCI_MX6
 #define CONFIG_USB_STORAGE
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 #define CONFIG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)

diff --git a/include/configs/ma5d4evk.h b/include/configs/ma5d4evk.h
index bb8542646e409debd5a0b84fc5063fe6ec2fd1f9..8413c5c23463bbab660ac0b83984a1a797c331d6 100644 (file)
--- a/include/configs/ma5d4evk.h
+++ b/include/configs/ma5d4evk.h
@@ -102,7 +102,6 @@
  * USB
  */
 #ifdef CONFIG_CMD_USB
-#define CONFIG_USB_EHCI_ATMEL
 #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS     3
 
 /* USB device */

diff --git a/include/configs/mccmon6.h b/include/configs/mccmon6.h
index 996b2d1774ab12b659a76bded6f06a86fbc54b2c..4b9b5312bf862dd301dc95ea99bb4239dfbbe612 100644 (file)
--- a/include/configs/mccmon6.h
+++ b/include/configs/mccmon6.h
@@ -98,7 +98,6 @@
        "128k@0x19C0000(swupdate-kernel-dtb.nor)"
 
 /* USB Configs */
-#define CONFIG_USB_EHCI_MX6
 #define CONFIG_USB_STORAGE
 #define CONFIG_USB_MAX_CONTROLLER_COUNT        2
 #define CONFIG_MXC_USB_PORTSC          (PORT_PTS_UTMI | PORT_PTS_PTW)

diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h
index 87bec2946c03241ce50cd09185ec0f145c39189f..b2cecc5d0eb46a93a7e8c64f270019ef21f255c3 100644 (file)
--- a/include/configs/mx6cuboxi.h
+++ b/include/configs/mx6cuboxi.h
@@ -44,7 +44,6 @@
 #define CONFIG_IMX_VIDEO_SKIP
 
 /* USB */
-#define CONFIG_USB_EHCI_MX6
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 #define CONFIG_MXC_USB_PORTSC          (PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CONFIG_MXC_USB_FLAGS           0

diff --git a/include/configs/mx6qarm2.h b/include/configs/mx6qarm2.h
index 0a04244e02c08d0639ece2cf387d49a5f81608ce..de5dc1c45175e10f138698edfe0270f8747b6882 100644 (file)
--- a/include/configs/mx6qarm2.h
+++ b/include/configs/mx6qarm2.h
@@ -128,7 +128,6 @@
 
 /* USB Configs */
 #ifdef CONFIG_CMD_USB
-#define CONFIG_USB_EHCI_MX6
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 #define CONFIG_USB_HOST_ETHER
 #define CONFIG_USB_ETHER_ASIX

diff --git a/include/configs/mx6qsabreauto.h b/include/configs/mx6qsabreauto.h
index 00b3bc87ddaab338fd77118b1991d509ea05b265..635c04acf9ea151cad38e29b75cf6d1c7d1b6504 100644 (file)
--- a/include/configs/mx6qsabreauto.h
+++ b/include/configs/mx6qsabreauto.h
@@ -15,7 +15,6 @@
 #define CONFIG_MMCROOT                 "/dev/mmcblk0p2"
 
 /* USB Configs */
-#define CONFIG_USB_EHCI_MX6
 #define CONFIG_USB_HOST_ETHER
 #define CONFIG_USB_ETHER_ASIX
 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2

diff --git a/include/configs/mx6sabresd.h b/include/configs/mx6sabresd.h
index 1fd972f918c6aec4a098c8aac93999a4b7f8fd30..a8c0e035829a358cef11735cbfb3e4580ab41790 100644 (file)
--- a/include/configs/mx6sabresd.h
+++ b/include/configs/mx6sabresd.h
@@ -63,7 +63,6 @@
 
 /* USB Configs */
 #ifdef CONFIG_CMD_USB
-#define CONFIG_USB_EHCI_MX6
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 #define CONFIG_USB_HOST_ETHER
 #define CONFIG_USB_ETHER_ASIX

diff --git a/include/configs/mx6slevk.h b/include/configs/mx6slevk.h
index c05078227a5815dcf35f7eda9a3b8eff6742ea83..6ab76bb8fa1062d9f7c0ba8a55fc06699e77416b 100644 (file)
--- a/include/configs/mx6slevk.h
+++ b/include/configs/mx6slevk.h
@@ -159,7 +159,6 @@
 
 /* USB Configs */
 #ifdef CONFIG_CMD_USB
-#define CONFIG_USB_EHCI_MX6
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 #define CONFIG_USB_HOST_ETHER
 #define CONFIG_USB_ETHER_ASIX

diff --git a/include/configs/mx6sxsabreauto.h b/include/configs/mx6sxsabreauto.h
index 8809d8011f79ce7667a9c44e79cb6149af459bfa..3e73dad9a3ff5a3b6418616c20509d86dae53f29 100644 (file)
--- a/include/configs/mx6sxsabreauto.h
+++ b/include/configs/mx6sxsabreauto.h
@@ -149,7 +149,6 @@
 #define CONFIG_PHY_ATHEROS
 
 #ifdef CONFIG_CMD_USB
-#define CONFIG_USB_EHCI_MX6
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 #define CONFIG_USB_HOST_ETHER
 #define CONFIG_USB_ETHER_ASIX

diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h
index bdec09b7f3ec32d608e3d47566de72cd1239b102..b39ab729d8a439e934ef0d91b7264845fcdcd3e7 100644 (file)
--- a/include/configs/mx6sxsabresd.h
+++ b/include/configs/mx6sxsabresd.h
@@ -167,7 +167,6 @@
 #define CONFIG_PHY_ATHEROS
 
 #ifdef CONFIG_CMD_USB
-#define CONFIG_USB_EHCI_MX6
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 #define CONFIG_USB_HOST_ETHER
 #define CONFIG_USB_ETHER_ASIX

diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h
index 98d9755abb3de4a4532fcd510dd4b8fb494d6d57..2c40decf499b9dea9dd800aa3b099f82ebac8106 100644 (file)
--- a/include/configs/mx6ul_14x14_evk.h
+++ b/include/configs/mx6ul_14x14_evk.h
@@ -186,7 +186,6 @@
 
 /* USB Configs */
 #ifdef CONFIG_CMD_USB
-#define CONFIG_USB_EHCI_MX6
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 #define CONFIG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CONFIG_MXC_USB_FLAGS   0

diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h
index de57b2e83ea8ec9b6ab28063eb57e16bce500305..13625286c5b7274aa873209b297c0c14ca231275 100644 (file)
--- a/include/configs/nitrogen6x.h
+++ b/include/configs/nitrogen6x.h
@@ -74,7 +74,6 @@
 #define CONFIG_PHY_MICREL_KSZ9021
 
 /* USB Configs */
-#define CONFIG_USB_EHCI_MX6
 #define CONFIG_USB_HOST_ETHER
 #define CONFIG_USB_ETHER_ASIX
 #define CONFIG_USB_ETHER_MCS7830

diff --git a/include/configs/novena.h b/include/configs/novena.h
index b57ef30f942c608aa367d35e140030cdbb233036..e0ed30458656262d20802a2efe6d0ffc36fb60e0 100644 (file)
--- a/include/configs/novena.h
+++ b/include/configs/novena.h
@@ -135,7 +135,6 @@
 
 /* USB Configs */
 #ifdef CONFIG_CMD_USB
-#define CONFIG_USB_EHCI_MX6
 #define CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP
 #define CONFIG_USB_HOST_ETHER
 #define CONFIG_USB_ETHER_ASIX

diff --git a/include/configs/ot1200.h b/include/configs/ot1200.h
index 826bef19e14aa31d8dc3f76cb193cea4ba40ea38..34da90f20b6a85ae45100ced9fdc39c3d9cea8db 100644 (file)
--- a/include/configs/ot1200.h
+++ b/include/configs/ot1200.h
@@ -55,7 +55,6 @@
 #define CONFIG_SYS_FSL_USDHC_NUM       2
 
 /* USB Configs */
-#define CONFIG_USB_EHCI_MX6
 #define CONFIG_MXC_USB_PORTSC   (PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2
 

diff --git a/include/configs/pico-imx6ul.h b/include/configs/pico-imx6ul.h
index 1ede6c92ec9ede0d41d4b81dfa8b56e3f1b8e6e3..8d78f49c96843bd75e1478f5ef2887e446ae37db 100644 (file)
--- a/include/configs/pico-imx6ul.h
+++ b/include/configs/pico-imx6ul.h
@@ -37,7 +37,6 @@
 #define CONFIG_SUPPORT_EMMC_BOOT
 
 /* USB Configs */
-#define CONFIG_USB_EHCI_MX6
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 #define CONFIG_MXC_USB_PORTSC          (PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CONFIG_MXC_USB_FLAGS           0

diff --git a/include/configs/picosam9g45.h b/include/configs/picosam9g45.h
index c6d23a658277edcf45eebba9792dec2cb991f977..998a7a344b2b9e7a05fd8afc8f49fc80708fafd9 100644 (file)
--- a/include/configs/picosam9g45.h
+++ b/include/configs/picosam9g45.h
@@ -98,7 +98,6 @@
 #define CONFIG_AT91_WANTS_COMMON_PHY
 
 /* USB */
-#define CONFIG_USB_EHCI_ATMEL
 #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS     2
 
 #define CONFIG_SYS_LOAD_ADDR           0x22000000      /* load address */

diff --git a/include/configs/platinum.h b/include/configs/platinum.h
index a628971a808f6d9c15ed52fe9ca9ced968dcf111..9c2182cbea304951801939b6322985ec85936543 100644 (file)
--- a/include/configs/platinum.h
+++ b/include/configs/platinum.h
@@ -52,7 +52,6 @@
 #define CONFIG_PHYLIB
 
 /* USB config */
-#define CONFIG_USB_EHCI_MX6
 #define CONFIG_MXC_USB_PORT                    1
 #define CONFIG_MXC_USB_PORTSC                  (PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CONFIG_MXC_USB_FLAGS                   0

diff --git a/include/configs/sama5d2_ptc.h b/include/configs/sama5d2_ptc.h
index 1a01ff7422399aaeca391655b8c825252c203ca1..7d20d65bf3b1a4ba5572a3ff4a36baa62b5c9408 100644 (file)
--- a/include/configs/sama5d2_ptc.h
+++ b/include/configs/sama5d2_ptc.h
@@ -66,7 +66,6 @@
 #define CONFIG_CMD_USB
 
 #ifdef CONFIG_CMD_USB
-#define CONFIG_USB_EHCI_ATMEL
 #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS     3
 #endif
 

diff --git a/include/configs/snapper9g45.h b/include/configs/snapper9g45.h
index ab9f8d62fa3a20034e3a925e60195900f21d909d..99b5b23d2940b85d670c8ebbb932de2642b2924b 100644 (file)
--- a/include/configs/snapper9g45.h
+++ b/include/configs/snapper9g45.h
@@ -61,7 +61,6 @@
 #define CONFIG_TFTP_TSIZE
 
 /* USB */
-#define CONFIG_USB_EHCI_ATMEL
 #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS     2
 
 /* MMC */

diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h
index f94eda8aacba83c0842728e09d38600fb7b8bd4c..9720a09b32339aaef17a03306f1ce69a3abee84f 100644 (file)
--- a/include/configs/tbs2910.h
+++ b/include/configs/tbs2910.h
@@ -93,7 +93,6 @@
 
 /* USB */
 #ifdef CONFIG_CMD_USB
-#define CONFIG_USB_EHCI_MX6
 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 #define CONFIG_MXC_USB_PORTSC          (PORT_PTS_UTMI | PORT_PTS_PTW)

diff --git a/include/configs/titanium.h b/include/configs/titanium.h
index 1b00db57d74eb28fb4c1a30b927734b4e5fe755b..79e37e2cefb051bcec5b620d0fff8f038ce1a8d5 100644 (file)
--- a/include/configs/titanium.h
+++ b/include/configs/titanium.h
@@ -50,7 +50,6 @@
 #define CONFIG_PHY_MICREL_KSZ9021
 
 /* USB Configs */
-#define CONFIG_USB_EHCI_MX6
 #define CONFIG_MXC_USB_PORT    1
 #define CONFIG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CONFIG_MXC_USB_FLAGS   0

diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h
index cf8ae9fffebb6355b420f8bb6c60d9b87bd785bc..738693c0c008565b4df4ed088d141a26ceb1fe80 100644 (file)
--- a/include/configs/tqma6.h
+++ b/include/configs/tqma6.h
@@ -81,7 +81,6 @@
 #define CONFIG_SYS_FSL_ESDHC_ADDR      0
 
 /* USB Configs */
-#define CONFIG_USB_EHCI_MX6
 #define CONFIG_USB_HOST_ETHER
 #define CONFIG_USB_ETHER_SMSC95XX
 #define CONFIG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)

diff --git a/include/configs/vinco.h b/include/configs/vinco.h
index 1651431ccaff11abc43fa884b19c1063d450054a..dc35b289d42a55de1f0671167173206ffade9e44 100644 (file)
--- a/include/configs/vinco.h
+++ b/include/configs/vinco.h
@@ -66,7 +66,6 @@
 /* USB */
 
 #ifdef CONFIG_CMD_USB
-#define CONFIG_USB_EHCI_ATMEL
 #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS     3
 #endif
 

diff --git a/include/configs/vining_2000.h b/include/configs/vining_2000.h
index dda01132637bf1210ab76d0aa0278aaa3c40f94d..78e14b38c113a78108581793f5ebc10c335cae57 100644 (file)
--- a/include/configs/vining_2000.h
+++ b/include/configs/vining_2000.h
@@ -76,7 +76,6 @@
 #define CONFIG_PHY_ATHEROS
 
 #ifdef CONFIG_CMD_USB
-#define CONFIG_USB_EHCI_MX6
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 #define CONFIG_USB_HOST_ETHER
 #define CONFIG_USB_ETHER_ASIX

diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h
index 6a9665370241cfa552e80f01938255a24aeea46b..3e0ea71e69af90b66fe5a0583a30dd111a990303 100644 (file)
--- a/include/configs/wandboard.h
+++ b/include/configs/wandboard.h
@@ -50,7 +50,6 @@
 #define CONFIG_SYS_FSL_ESDHC_ADDR      0
 
 /* USB Configs */
-#define CONFIG_USB_EHCI_MX6
 #define CONFIG_USB_MAX_CONTROLLER_COUNT        2
 #define CONFIG_MXC_USB_PORTSC          (PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CONFIG_MXC_USB_FLAGS           0

diff --git a/include/configs/warp.h b/include/configs/warp.h
index ec95061d609281cbffb64529b659120e02b76959..afe3eaed46d1c5f74b2ca36a159222162a76251f 100644 (file)
--- a/include/configs/warp.h
+++ b/include/configs/warp.h
@@ -58,7 +58,6 @@
 
 /* USB Configs */
 #ifdef CONFIG_CMD_USB
-#define CONFIG_USB_EHCI_MX6
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 #define CONFIG_MXC_USB_PORTSC          (PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CONFIG_MXC_USB_FLAGS           0

diff --git a/include/configs/xpress.h b/include/configs/xpress.h
index efc364ff6c680dc90d3ada934366a91f7234f27a..e13b792f38679eb911e8c17fc48b1c0bb1675c26 100644 (file)
--- a/include/configs/xpress.h
+++ b/include/configs/xpress.h
@@ -64,7 +64,6 @@
 #define CONFIG_MMCROOT                 "/dev/mmcblk0p2"  /* USDHC2 */
 
 /* USB Configs */
-#define CONFIG_USB_EHCI_MX6
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 #define CONFIG_MXC_USB_PORTSC          (PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CONFIG_MXC_USB_FLAGS           0