Kconfig: USB: Migrate CONFIG_USB_EHCI_HCD users to Kconfig

Migrate the rest of the users of CONFIG_USB_EHCI_HCD over to Kconfig. For a few SoCs, imply or default y this if USB is enabled. In some cases we had not already migrated to CONFIG_USB so do that as well. Cc: Marek Vasut <marex@denx.de> Signed-off-by: Tom Rini <trini@konsulko.com> Reviewed-by: Marek Vasut <marex@denx.de>
2026-06-13 15:03:58 +03:00 · 2017-05-12 22:33:28 -04:00
parent 8850c5d57c
commit 64d6ac5bc4
256 changed files with 115 additions and 157 deletions
--- a/include/configs/B4860QDS.h
+++ b/include/configs/B4860QDS.h
@@ -723,8 +723,6 @@ unsigned long get_board_ddr_clk(void);
 #define CONFIG_HAS_FSL_DR_USB

 #ifdef CONFIG_HAS_FSL_DR_USB
-#define CONFIG_USB_EHCI_HCD
-
 #ifdef CONFIG_USB_EHCI_HCD
 #define CONFIG_USB_EHCI_FSL
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
--- a/include/configs/BSC9131RDB.h
+++ b/include/configs/BSC9131RDB.h
@@ -334,8 +334,6 @@ extern unsigned long get_sdram_size(void);
 #define CONFIG_SHA_HW_ACCEL
 #endif

-#define CONFIG_USB_EHCI_HCD
-
 #ifdef CONFIG_USB_EHCI_HCD
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 #define CONFIG_USB_EHCI_FSL
--- a/include/configs/BSC9132QDS.h
+++ b/include/configs/BSC9132QDS.h
@@ -476,7 +476,6 @@ combinations. this should be removed later
 #define CONFIG_SYS_FSL_ESDHC_ADDR	CONFIG_SYS_MPC85xx_ESDHC_ADDR
 #endif

-#define CONFIG_USB_EHCI_HCD  /* USB */
 #ifdef CONFIG_USB_EHCI_HCD
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 #define CONFIG_USB_EHCI_FSL
--- a/include/configs/M52277EVB.h
+++ b/include/configs/M52277EVB.h
@@ -88,7 +88,6 @@

 /* USB */
 #ifdef CONFIG_CMD_USB
-#define CONFIG_USB_EHCI_HCD
 #define CONFIG_SYS_USB_EHCI_REGS_BASE	0xFC0B0000
 #define CONFIG_SYS_USB_EHCI_CPU_INIT
 #endif
--- a/include/configs/MPC8315ERDB.h
+++ b/include/configs/MPC8315ERDB.h
@@ -366,7 +366,6 @@
 #define CONFIG_HAS_FSL_DR_USB
 #define CONFIG_SYS_SCCR_USBDRCM		3

-#define CONFIG_USB_EHCI_HCD
 #define CONFIG_USB_EHCI_FSL
 #define CONFIG_USB_PHY_TYPE	"utmi"
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
--- a/include/configs/MPC8349ITX.h
+++ b/include/configs/MPC8349ITX.h
@@ -148,7 +148,6 @@
 /*
 * Support USB
 */
-#define CONFIG_USB_EHCI_HCD
 #define CONFIG_USB_EHCI_FSL

 /* Current USB implementation supports the only USB controller,
--- a/include/configs/MPC837XEMDS.h
+++ b/include/configs/MPC837XEMDS.h
@@ -376,7 +376,6 @@ extern int board_pci_host_broken(void);
 #define CONFIG_PQ_MDS_PIB	1 /* PQ MDS Platform IO Board */

 #define CONFIG_HAS_FSL_DR_USB	1 /* fixup device tree for the DR USB */
-#define CONFIG_USB_EHCI_HCD
 #define CONFIG_USB_EHCI_FSL
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET

--- a/include/configs/MPC837XERDB.h
+++ b/include/configs/MPC837XERDB.h
@@ -651,7 +651,6 @@
 #define CONFIG_ENV_OVERWRITE

 #define CONFIG_HAS_FSL_DR_USB
-#define CONFIG_USB_EHCI_HCD
 #define CONFIG_USB_EHCI_FSL
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET

--- a/include/configs/MPC8536DS.h
+++ b/include/configs/MPC8536DS.h
@@ -609,8 +609,6 @@
 */
 #define CONFIG_HAS_FSL_MPH_USB
 #ifdef CONFIG_HAS_FSL_MPH_USB
-#define CONFIG_USB_EHCI_HCD
-
 #ifdef CONFIG_USB_EHCI_HCD
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 #define CONFIG_USB_EHCI_FSL
--- a/include/configs/MPC8544DS.h
+++ b/include/configs/MPC8544DS.h
@@ -359,7 +359,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
 /*
 * USB
 */
-#define CONFIG_USB_EHCI_HCD

 #ifdef CONFIG_USB_EHCI_HCD
 #define CONFIG_USB_EHCI_PCI
--- a/include/configs/MPC8572DS.h
+++ b/include/configs/MPC8572DS.h
@@ -559,7 +559,6 @@
 /*
 * USB
 */
-#define CONFIG_USB_EHCI_HCD

 #ifdef CONFIG_USB_EHCI_HCD
 #define CONFIG_USB_EHCI_PCI
--- a/include/configs/P1010RDB.h
+++ b/include/configs/P1010RDB.h
@@ -670,8 +670,6 @@ extern unsigned long get_sdram_size(void);
 #define CONFIG_HAS_FSL_DR_USB

 #if defined(CONFIG_HAS_FSL_DR_USB)
-#define CONFIG_USB_EHCI_HCD
-
 #ifdef CONFIG_USB_EHCI_HCD
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 #define CONFIG_USB_EHCI_FSL
--- a/include/configs/P1022DS.h
+++ b/include/configs/P1022DS.h
@@ -606,8 +606,6 @@
 */
 #define CONFIG_HAS_FSL_DR_USB
 #ifdef CONFIG_HAS_FSL_DR_USB
-#define CONFIG_USB_EHCI_HCD
-
 #ifdef CONFIG_USB_EHCI_HCD
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 #define CONFIG_USB_EHCI_FSL
--- a/include/configs/P1023RDB.h
+++ b/include/configs/P1023RDB.h
@@ -253,8 +253,6 @@ extern unsigned long get_clock_freq(void);
 */
 #define CONFIG_HAS_FSL_DR_USB
 #ifdef CONFIG_HAS_FSL_DR_USB
-#define CONFIG_USB_EHCI_HCD
-
 #ifdef CONFIG_USB_EHCI_HCD
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 #define CONFIG_USB_EHCI_FSL
--- a/include/configs/P2041RDB.h
+++ b/include/configs/P2041RDB.h
@@ -594,7 +594,6 @@ unsigned long get_board_sys_clk(unsigned long dummy);
 #define CONFIG_HAS_FSL_MPH_USB

 #if defined(CONFIG_HAS_FSL_DR_USB) || defined(CONFIG_HAS_FSL_MPH_USB)
-#define CONFIG_USB_EHCI_HCD
 #define CONFIG_USB_EHCI_FSL
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 #endif
--- a/include/configs/T102xQDS.h
+++ b/include/configs/T102xQDS.h
@@ -637,7 +637,6 @@ unsigned long get_board_ddr_clk(void);
 #define CONFIG_HAS_FSL_DR_USB

 #ifdef CONFIG_HAS_FSL_DR_USB
-#define CONFIG_USB_EHCI_HCD
 #define CONFIG_USB_EHCI_FSL
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 #endif
--- a/include/configs/T102xRDB.h
+++ b/include/configs/T102xRDB.h
@@ -641,7 +641,6 @@ unsigned long get_board_ddr_clk(void);
 #define CONFIG_HAS_FSL_DR_USB

 #ifdef CONFIG_HAS_FSL_DR_USB
-#define CONFIG_USB_EHCI_HCD
 #define CONFIG_USB_EHCI_FSL
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 #endif
--- a/include/configs/T1040QDS.h
+++ b/include/configs/T1040QDS.h
@@ -527,8 +527,6 @@ unsigned long get_board_ddr_clk(void);
 #define CONFIG_HAS_FSL_DR_USB

 #ifdef CONFIG_HAS_FSL_DR_USB
-#define CONFIG_USB_EHCI_HCD
-
 #ifdef CONFIG_USB_EHCI_HCD
 #define CONFIG_USB_EHCI_FSL
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
--- a/include/configs/T104xRDB.h
+++ b/include/configs/T104xRDB.h
@@ -637,8 +637,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg
 #define CONFIG_HAS_FSL_DR_USB

 #ifdef CONFIG_HAS_FSL_DR_USB
-#define CONFIG_USB_EHCI_HCD
-
 #ifdef CONFIG_USB_EHCI_HCD
 #define CONFIG_USB_EHCI_FSL
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
--- a/include/configs/T208xQDS.h
+++ b/include/configs/T208xQDS.h
@@ -12,7 +12,6 @@
 #define __T208xQDS_H

 #define CONFIG_ICS307_REFCLK_HZ 25000000  /* ICS307 ref clk freq */
-#define CONFIG_USB_EHCI_HCD
 #if defined(CONFIG_ARCH_T2080)
 #define CONFIG_FSL_SATA_V2
 #define CONFIG_SYS_SRIO		/* Enable Serial RapidIO Support */
--- a/include/configs/T208xRDB.h
+++ b/include/configs/T208xRDB.h
@@ -12,7 +12,6 @@
 #define __T2080RDB_H

 #define CONFIG_ICS307_REFCLK_HZ 25000000  /* ICS307 ref clk freq */
-#define CONFIG_USB_EHCI_HCD
 #define CONFIG_FSL_SATA_V2

 /* High Level Configuration Options */
--- a/include/configs/T4240QDS.h
+++ b/include/configs/T4240QDS.h
@@ -507,7 +507,6 @@ unsigned long get_board_ddr_clk(void);
 /*
 * USB
 */
-#define CONFIG_USB_EHCI_HCD
 #define CONFIG_USB_EHCI_FSL
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 #define CONFIG_HAS_FSL_DR_USB
--- a/include/configs/T4240RDB.h
+++ b/include/configs/T4240RDB.h
@@ -685,7 +685,6 @@ unsigned long get_board_ddr_clk(void);
 /*
 * USB
 */
-#define CONFIG_USB_EHCI_HCD
 #define CONFIG_USB_EHCI_FSL
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 #define CONFIG_HAS_FSL_DR_USB
--- a/include/configs/UCP1020.h
+++ b/include/configs/UCP1020.h
@@ -453,8 +453,6 @@
 #define CONFIG_HAS_FSL_DR_USB

 #if defined(CONFIG_HAS_FSL_DR_USB)
-#define CONFIG_USB_EHCI_HCD
-
 #define CONFIG_USB_MAX_CONTROLLER_COUNT 1

 #ifdef CONFIG_USB_EHCI_HCD
--- 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_HCD
 #define CONFIG_USB_EHCI_MX6
 #define CONFIG_USB_STORAGE
 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2
--- a/include/configs/alt.h
+++ b/include/configs/alt.h
@@ -81,7 +81,6 @@
 #define CONFIG_SYS_I2C_POWERIC_ADDR 0x58 /* da9063 */

 /* USB */
-#define CONFIG_USB_EHCI_HCD
 #define CONFIG_USB_EHCI_RMOBILE
 #define CONFIG_USB_MAX_CONTROLLER_COUNT	2

--- a/include/configs/apalis-tk1.h
+++ b/include/configs/apalis-tk1.h
@@ -36,7 +36,6 @@
 #define CONFIG_SYS_MMC_ENV_PART		1

 /* USB host support */
-#define CONFIG_USB_EHCI_HCD
 #define CONFIG_USB_EHCI_TEGRA

 /* PCI host support */
--- a/include/configs/apalis_t30.h
+++ b/include/configs/apalis_t30.h
@@ -33,7 +33,6 @@
 #define CONFIG_SYS_MMC_ENV_PART		1

 /* USB host support */
-#define CONFIG_USB_EHCI_HCD
 #define CONFIG_USB_EHCI_TEGRA

 /* PCI host support */
--- 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_HCD
 #define CONFIG_USB_EHCI_MX6
 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET	/* For OTG port */
--- a/include/configs/beaver.h
+++ b/include/configs/beaver.h
@@ -39,7 +39,6 @@
 #define CONFIG_SPI_FLASH_SIZE          (4 << 20)

 /* USB Host support */
-#define CONFIG_USB_EHCI_HCD
 #define CONFIG_USB_EHCI_TEGRA

 /* USB networking support */
--- a/include/configs/cardhu.h
+++ b/include/configs/cardhu.h
@@ -43,7 +43,6 @@
 #define CONFIG_SPI_FLASH_SIZE          (4 << 20)

 /* USB Host support */
-#define CONFIG_USB_EHCI_HCD
 #define CONFIG_USB_EHCI_TEGRA

 /* USB networking support */
--- a/include/configs/cei-tk1-som.h
+++ b/include/configs/cei-tk1-som.h
@@ -38,7 +38,6 @@
 #define CONFIG_SPI_FLASH_SIZE		(4 << 20)

 /* USB Host support */
-#define CONFIG_USB_EHCI_HCD
 #define CONFIG_USB_EHCI_TEGRA

 /* USB networking support */
--- 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_HCD
 #define CONFIG_USB_EHCI_MX6
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 #define CONFIG_USB_HOST_ETHER
--- a/include/configs/cm_t35.h
+++ b/include/configs/cm_t35.h
@@ -75,7 +75,6 @@

 /* USB */
 #define CONFIG_USB_OMAP3
-#define CONFIG_USB_EHCI_HCD
 #define CONFIG_USB_EHCI_OMAP
 #define CONFIG_USB_MUSB_UDC
 #define CONFIG_TWL4030_USB
--- a/include/configs/cm_t3517.h
+++ b/include/configs/cm_t3517.h
@@ -84,7 +84,6 @@

 #ifndef CONFIG_USB_MUSB_AM35X
 #define CONFIG_USB_OMAP3
-#define CONFIG_USB_EHCI_HCD
 #define CONFIG_USB_EHCI_OMAP
 #define CONFIG_OMAP_EHCI_PHY1_RESET_GPIO 146
 #define CONFIG_OMAP_EHCI_PHY2_RESET_GPIO 147
--- a/include/configs/cm_t54.h
+++ b/include/configs/cm_t54.h
@@ -58,7 +58,6 @@
 #define CONFIG_SYS_SCSI_MAX_DEVICE	(CONFIG_SYS_SCSI_MAX_SCSI_ID * \
 						CONFIG_SYS_SCSI_MAX_LUN)
 /* USB UHH support options */
-#define CONFIG_USB_EHCI_HCD
 #define CONFIG_USB_EHCI_OMAP
 #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS	3
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
--- a/include/configs/colibri_t20.h
+++ b/include/configs/colibri_t20.h
@@ -25,7 +25,6 @@
 #define CONFIG_SYS_I2C_TEGRA

 /* USB host support */
-#define CONFIG_USB_EHCI_HCD
 #define CONFIG_USB_EHCI_TEGRA
 #define CONFIG_USB_MAX_CONTROLLER_COUNT	3

--- a/include/configs/colibri_t30.h
+++ b/include/configs/colibri_t30.h
@@ -33,7 +33,6 @@
 #define CONFIG_SYS_MMC_ENV_PART		1

 /* USB host support */
-#define CONFIG_USB_EHCI_HCD
 #define CONFIG_USB_EHCI_TEGRA

 /* USB networking support */
--- a/include/configs/colibri_vf.h
+++ b/include/configs/colibri_vf.h
@@ -191,7 +191,6 @@
 #endif

 /* USB Host Support */
-#define CONFIG_USB_EHCI_HCD
 #define CONFIG_USB_EHCI_VF
 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
--- a/include/configs/controlcenterd.h
+++ b/include/configs/controlcenterd.h
@@ -291,7 +291,6 @@
 /*
 * USB
 */
-#define CONFIG_USB_EHCI_HCD

 #define CONFIG_HAS_FSL_DR_USB
 #define CONFIG_USB_EHCI_FSL
--- a/include/configs/corenet_ds.h
+++ b/include/configs/corenet_ds.h
@@ -608,7 +608,6 @@
 #define CONFIG_HAS_FSL_MPH_USB

 #if defined(CONFIG_HAS_FSL_DR_USB) || defined(CONFIG_HAS_FSL_MPH_USB)
-#define CONFIG_USB_EHCI_HCD
 #define CONFIG_USB_EHCI_FSL
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 #endif
--- 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_HCD
 #define CONFIG_USB_EHCI_ATMEL
 #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS	2

--- a/include/configs/cyrus.h
+++ b/include/configs/cyrus.h
@@ -426,7 +426,6 @@
 #define CONFIG_HAS_FSL_MPH_USB

 #if defined(CONFIG_HAS_FSL_DR_USB) || defined(CONFIG_HAS_FSL_MPH_USB)
-#define CONFIG_USB_EHCI_HCD
 #define CONFIG_USB_EHCI_FSL
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 #define CONFIG_EHCI_IS_TDI
--- a/include/configs/dalmore.h
+++ b/include/configs/dalmore.h
@@ -35,7 +35,6 @@
 #define CONFIG_SPI_FLASH_SIZE          (4 << 20)

 /* USB Host support */
-#define CONFIG_USB_EHCI_HCD
 #define CONFIG_USB_EHCI_TEGRA

 /* USB networking support */
--- 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_HCD
 #define CONFIG_USB_EHCI_MARVELL
 #define CONFIG_EHCI_IS_TDI
 #endif
--- a/include/configs/duovero.h
+++ b/include/configs/duovero.h
@@ -25,7 +25,6 @@
 #define CONFIG_SYS_DEFAULT_LPDDR2_TIMINGS

 /* USB UHH support options */
-#define CONFIG_USB_EHCI_HCD
 #define CONFIG_USB_EHCI_OMAP
 #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3

--- a/include/configs/e2220-1170.h
+++ b/include/configs/e2220-1170.h
@@ -33,7 +33,6 @@
 #define CONFIG_SPI_FLASH_SIZE		(4 << 20)

 /* USB2.0 Host support */
-#define CONFIG_USB_EHCI_HCD
 #define CONFIG_USB_EHCI_TEGRA

 /* USB networking support */
--- a/include/configs/eco5pk.h
+++ b/include/configs/eco5pk.h
@@ -15,7 +15,6 @@

 #include "tam3517-common.h"

-#undef CONFIG_USB_EHCI_HCD
 #undef CONFIG_USB_EHCI_OMAP
 #undef CONFIG_USB_OMAP3

--- 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_HCD		/* Enable EHCI USB support */
 #define CONFIG_USB_EHCI_MARVELL
 #define ORION5X_USB20_HOST_PORT_BASE ORION5X_USB20_PORT0_BASE
 #define CONFIG_SUPPORT_VFAT
--- 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_HCD
 #define CONFIG_USB_EHCI_MX6
 #define CONFIG_USB_HOST_ETHER
 #define CONFIG_USB_ETHER_ASIX
--- a/include/configs/exynos5250-common.h
+++ b/include/configs/exynos5250-common.h
@@ -26,7 +26,6 @@
 #define CONFIG_SYS_INIT_SP_ADDR	CONFIG_IRAM_STACK

 /* USB */
-#define CONFIG_USB_EHCI_HCD
 #define CONFIG_USB_EHCI_EXYNOS

 #define CONFIG_USB_XHCI_EXYNOS
--- 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_HCD
 #define CONFIG_USB_EHCI_MX6
 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
--- a/include/configs/gose.h
+++ b/include/configs/gose.h
@@ -78,7 +78,6 @@
 #define CONFIG_SYS_I2C_POWERIC_ADDR 0x58 /* da9063 */

 /* USB */
-#define CONFIG_USB_EHCI_HCD
 #define CONFIG_USB_EHCI_RMOBILE
 #define CONFIG_USB_MAX_CONTROLLER_COUNT	2

--- a/include/configs/gplugd.h
+++ b/include/configs/gplugd.h
@@ -82,7 +82,6 @@
 #define CONFIG_ENV_SIZE			0x4000

 #ifdef CONFIG_CMD_USB
-#define CONFIG_USB_EHCI_HCD
 #define CONFIG_USB_EHCI_ARMADA100
 #define CONFIG_EHCI_IS_TDI
 #endif /* CONFIG_CMD_USB */
--- 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_HCD
 #define CONFIG_USB_EHCI_MX6
 #define CONFIG_USB_HOST_ETHER
 #define CONFIG_USB_ETHER_ASIX
--- a/include/configs/harmony.h
+++ b/include/configs/harmony.h
@@ -36,7 +36,6 @@
 #define CONFIG_ENV_OFFSET	(SZ_512M - SZ_128K) /* 128K sector size */

 /* USB Host support */
-#define CONFIG_USB_EHCI_HCD
 #define CONFIG_USB_EHCI_TEGRA

 /* USB networking support */
--- a/include/configs/jetson-tk1.h
+++ b/include/configs/jetson-tk1.h
@@ -34,7 +34,6 @@
 #define CONFIG_SPI_FLASH_SIZE		(4 << 20)

 /* USB Host support */
-#define CONFIG_USB_EHCI_HCD
 #define CONFIG_USB_EHCI_TEGRA

 /* USB networking support */
--- a/include/configs/koelsch.h
+++ b/include/configs/koelsch.h
@@ -78,7 +78,6 @@
 #define CONFIG_SYS_I2C_POWERIC_ADDR 0x58 /* da9063 */

 /* USB */
-#define CONFIG_USB_EHCI_HCD
 #define CONFIG_USB_EHCI_RMOBILE
 #define CONFIG_USB_MAX_CONTROLLER_COUNT	2

--- a/include/configs/lager.h
+++ b/include/configs/lager.h
@@ -80,7 +80,6 @@
 #define CONFIG_SYS_TMU_CLK_DIV	4

 /* USB */
-#define CONFIG_USB_EHCI_HCD
 #define CONFIG_USB_EHCI_RMOBILE
 #define CONFIG_USB_MAX_CONTROLLER_COUNT	3

--- a/include/configs/liteboard.h
+++ b/include/configs/liteboard.h
@@ -137,7 +137,6 @@

 /* USB Configs */
 #ifdef CONFIG_CMD_USB
-#define CONFIG_USB_EHCI_HCD
 #define CONFIG_USB_EHCI_MX6
 #define CONFIG_USB_STORAGE
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
--- a/include/configs/ls1012aqds.h
+++ b/include/configs/ls1012aqds.h
@@ -115,7 +115,6 @@
 /*#define CONFIG_HAS_FSL_DR_USB*/

 #ifdef CONFIG_HAS_FSL_DR_USB
-#define CONFIG_USB_EHCI_HCD
 #define CONFIG_USB_EHCI_FSL
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 #endif
--- a/include/configs/ls1021aqds.h
+++ b/include/configs/ls1021aqds.h
@@ -402,7 +402,6 @@ unsigned long get_board_ddr_clk(void);
 /*#define CONFIG_HAS_FSL_DR_USB*/

 #ifdef CONFIG_HAS_FSL_DR_USB
-#define CONFIG_USB_EHCI_HCD
 #define CONFIG_USB_EHCI_FSL
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 #endif
--- a/include/configs/ls1021atwr.h
+++ b/include/configs/ls1021atwr.h
@@ -40,7 +40,6 @@
 /*#define CONFIG_HAS_FSL_DR_USB*/

 #ifdef CONFIG_HAS_FSL_DR_USB
-#define CONFIG_USB_EHCI_HCD
 #define CONFIG_USB_EHCI_FSL
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 #endif
--- a/include/configs/lwmon5.h
+++ b/include/configs/lwmon5.h
@@ -362,7 +362,6 @@
 /*
 * USB/EHCI
 */
-#define CONFIG_USB_EHCI_HCD		/* Enable EHCI USB support	*/
 #define CONFIG_USB_EHCI_PPC4XX		/* on PPC4xx platform		*/
 #define CONFIG_SYS_PPC4XX_USB_ADDR	0xe0000300
 #define CONFIG_EHCI_MMIO_BIG_ENDIAN
--- a/include/configs/m53evk.h
+++ b/include/configs/m53evk.h
@@ -162,7 +162,6 @@
 * USB
 */
 #ifdef CONFIG_CMD_USB
-#define CONFIG_USB_EHCI_HCD
 #define CONFIG_USB_EHCI_MX5
 #define CONFIG_USB_HOST_ETHER
 #define CONFIG_USB_ETHER_ASIX
--- a/include/configs/ma5d4evk.h
+++ b/include/configs/ma5d4evk.h
@@ -102,7 +102,6 @@
 * USB
 */
 #ifdef CONFIG_CMD_USB
-#define CONFIG_USB_EHCI_HCD
 #define CONFIG_USB_EHCI_ATMEL
 #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS	3

--- 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_HCD
 #define CONFIG_USB_EHCI_MX6
 #define CONFIG_USB_STORAGE
 #define CONFIG_USB_MAX_CONTROLLER_COUNT	2
--- a/include/configs/medcom-wide.h
+++ b/include/configs/medcom-wide.h
@@ -29,7 +29,6 @@
 #define CONFIG_ENV_OFFSET		(SZ_512M - SZ_128K) /* 128K sectors */

 /* USB host support */
-#define CONFIG_USB_EHCI_HCD
 #define CONFIG_USB_EHCI_TEGRA

 /* USB networking support */
--- a/include/configs/mpc5121ads.h
+++ b/include/configs/mpc5121ads.h
@@ -369,7 +369,6 @@
 */

 #if defined(CONFIG_CMD_USB)
-#define CONFIG_USB_EHCI_HCD			/* Enable EHCI Support	*/
 #define CONFIG_USB_EHCI_FSL			/* On a FSL platform	*/
 #define CONFIG_EHCI_MMIO_BIG_ENDIAN		/* With big-endian regs	*/
 #define CONFIG_EHCI_DESC_BIG_ENDIAN
--- a/include/configs/mv-common.h
+++ b/include/configs/mv-common.h
@@ -121,7 +121,6 @@
 * Common USB/EHCI configuration
 */
 #if defined(CONFIG_CMD_USB) && !defined(CONFIG_DM)
-#define CONFIG_USB_EHCI_HCD		/* Enable EHCI USB support */
 #define CONFIG_SUPPORT_VFAT
 #endif /* CONFIG_CMD_USB */

--- a/include/configs/mx35pdk.h
+++ b/include/configs/mx35pdk.h
@@ -199,7 +199,6 @@
 #define CONFIG_SYS_NAND_LARGEPAGE

 /* EHCI driver */
-#define CONFIG_USB_EHCI_HCD
 #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS	1
 #define CONFIG_EHCI_IS_TDI
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
--- a/include/configs/mx51evk.h
+++ b/include/configs/mx51evk.h
@@ -73,7 +73,6 @@
 #define CONFIG_FEC_MXC_PHYADDR	0x1F

 /* USB Configs */
-#define CONFIG_USB_EHCI_HCD
 #define CONFIG_USB_EHCI_MX5
 #define CONFIG_USB_HOST_ETHER
 #define CONFIG_USB_ETHER_ASIX
--- a/include/configs/mx53cx9020.h
+++ b/include/configs/mx53cx9020.h
@@ -45,7 +45,6 @@
 #define CONFIG_FEC_MXC_PHYADDR	0x1F

 /* USB Configs */
-#define CONFIG_USB_EHCI_HCD
 #define CONFIG_USB_EHCI_MX5
 #define CONFIG_USB_STORAGE
 #define CONFIG_USB_HOST_ETHER
--- a/include/configs/mx53loco.h
+++ b/include/configs/mx53loco.h
@@ -42,7 +42,6 @@
 #define CONFIG_FEC_MXC_PHYADDR	0x1F

 /* USB Configs */
-#define CONFIG_USB_EHCI_HCD
 #define CONFIG_USB_EHCI_MX5
 #define CONFIG_USB_HOST_ETHER
 #define CONFIG_USB_ETHER_ASIX
--- a/include/configs/mx6cuboxi.h
+++ b/include/configs/mx6cuboxi.h
@@ -44,7 +44,6 @@
 #define CONFIG_IMX_VIDEO_SKIP

 /* USB */
-#define CONFIG_USB_EHCI_HCD
 #define CONFIG_USB_EHCI_MX6
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 #define CONFIG_MXC_USB_PORTSC		(PORT_PTS_UTMI | PORT_PTS_PTW)
--- a/include/configs/mx6qarm2.h
+++ b/include/configs/mx6qarm2.h
@@ -128,7 +128,6 @@

 /* USB Configs */
 #ifdef CONFIG_CMD_USB
-#define CONFIG_USB_EHCI_HCD
 #define CONFIG_USB_EHCI_MX6
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 #define CONFIG_USB_HOST_ETHER
--- 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_HCD
 #define CONFIG_USB_EHCI_MX6
 #define CONFIG_USB_HOST_ETHER
 #define CONFIG_USB_ETHER_ASIX
--- a/include/configs/mx6sabresd.h
+++ b/include/configs/mx6sabresd.h
@@ -63,7 +63,6 @@

 /* USB Configs */
 #ifdef CONFIG_CMD_USB
-#define CONFIG_USB_EHCI_HCD
 #define CONFIG_USB_EHCI_MX6
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 #define CONFIG_USB_HOST_ETHER
--- a/include/configs/mx6slevk.h
+++ b/include/configs/mx6slevk.h
@@ -159,7 +159,6 @@

 /* USB Configs */
 #ifdef CONFIG_CMD_USB
-#define CONFIG_USB_EHCI_HCD
 #define CONFIG_USB_EHCI_MX6
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 #define CONFIG_USB_HOST_ETHER
--- 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_HCD
 #define CONFIG_USB_EHCI_MX6
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 #define CONFIG_USB_HOST_ETHER
--- 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_HCD
 #define CONFIG_USB_EHCI_MX6
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 #define CONFIG_USB_HOST_ETHER
--- 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_HCD
 #define CONFIG_USB_EHCI_MX6
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 #define CONFIG_MXC_USB_PORTSC  (PORT_PTS_UTMI | PORT_PTS_PTW)
--- a/include/configs/mxs.h
+++ b/include/configs/mxs.h
@@ -168,7 +168,6 @@

 /* USB */
 #ifdef CONFIG_CMD_USB
-#define CONFIG_USB_EHCI_HCD
 #define CONFIG_USB_EHCI_MXS
 #define CONFIG_EHCI_IS_TDI
 #endif
--- a/include/configs/nas220.h
+++ b/include/configs/nas220.h
@@ -94,7 +94,6 @@
 * USB/EHCI
 */
 #ifdef CONFIG_CMD_USB
-#define CONFIG_USB_EHCI_HCD		/* Enable EHCI USB support */
 #define CONFIG_USB_EHCI_KIRKWOOD	/* on Kirkwood platform	*/
 #define CONFIG_EHCI_IS_TDI
 #define CONFIG_SUPPORT_VFAT
--- 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_HCD
 #define CONFIG_USB_EHCI_MX6
 #define CONFIG_USB_HOST_ETHER
 #define CONFIG_USB_ETHER_ASIX
--- a/include/configs/novena.h
+++ b/include/configs/novena.h
@@ -135,7 +135,6 @@

 /* USB Configs */
 #ifdef CONFIG_CMD_USB
-#define CONFIG_USB_EHCI_HCD
 #define CONFIG_USB_EHCI_MX6
 #define CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP
 #define CONFIG_USB_HOST_ETHER
--- a/include/configs/nyan-big.h
+++ b/include/configs/nyan-big.h
@@ -39,7 +39,6 @@
 #define CONFIG_SPI_FLASH_SIZE          (4 << 20)

 /* USB Host support */
-#define CONFIG_USB_EHCI_HCD
 #define CONFIG_USB_EHCI_TEGRA

 /* USB networking support */
--- a/include/configs/odroid.h
+++ b/include/configs/odroid.h
@@ -188,7 +188,6 @@
 #define CONFIG_LIB_HW_RAND

 /* USB */
-#define CONFIG_USB_EHCI_HCD
 #define CONFIG_USB_EHCI_EXYNOS

 #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS	3
--- a/include/configs/odroid_xu3.h
+++ b/include/configs/odroid_xu3.h
@@ -41,7 +41,6 @@
 #define CONFIG_DEFAULT_CONSOLE		"console=ttySAC2,115200n8\0"

 /* USB */
-#define CONFIG_USB_EHCI_HCD
 #define CONFIG_USB_EHCI_EXYNOS

 /* DFU */
--- a/include/configs/omap3_beagle.h
+++ b/include/configs/omap3_beagle.h
@@ -55,7 +55,6 @@
 #define CONFIG_FASTBOOT_BUF_SIZE	0x07000000

 /* USB EHCI */
-#define CONFIG_USB_EHCI_HCD

 #define CONFIG_USB_EHCI_OMAP
 #define CONFIG_OMAP_EHCI_PHY1_RESET_GPIO	147
--- a/include/configs/omap3_overo.h
+++ b/include/configs/omap3_overo.h
@@ -40,7 +40,6 @@
 #define CONFIG_TWL4030_LED

 /* USB EHCI */
-#define CONFIG_USB_EHCI_HCD
 #define CONFIG_USB_EHCI_OMAP
 #define CONFIG_OMAP_EHCI_PHY1_RESET_GPIO	183
 #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS	3
--- a/include/configs/omap4_panda.h
+++ b/include/configs/omap4_panda.h
@@ -17,7 +17,6 @@
 */

 /* USB UHH support options */
-#define CONFIG_USB_EHCI_HCD
 #define CONFIG_USB_EHCI_OMAP
 #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3

--- a/include/configs/omap5_uevm.h
+++ b/include/configs/omap5_uevm.h
@@ -52,7 +52,6 @@
 #define CONFIG_SYS_I2C_TCA642X_ADDR 0x22

 /* USB UHH support options */
-#define CONFIG_USB_EHCI_HCD
 #define CONFIG_USB_EHCI_OMAP
 #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
--- 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_HCD
 #define CONFIG_USB_EHCI_MX6
 #define CONFIG_MXC_USB_PORTSC   (PORT_PTS_UTMI | PORT_PTS_PTW)
 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2
--- a/include/configs/p1_p2_rdb_pc.h
+++ b/include/configs/p1_p2_rdb_pc.h
@@ -823,8 +823,6 @@
 #define CONFIG_HAS_FSL_DR_USB

 #if defined(CONFIG_HAS_FSL_DR_USB)
-#define CONFIG_USB_EHCI_HCD
-
 #ifdef CONFIG_USB_EHCI_HCD
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 #define CONFIG_USB_EHCI_FSL
--- a/include/configs/p1_twr.h
+++ b/include/configs/p1_twr.h
@@ -394,8 +394,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
 #define CONFIG_HAS_FSL_DR_USB

 #if defined(CONFIG_HAS_FSL_DR_USB)
-#define CONFIG_USB_EHCI_HCD
-
 #ifdef CONFIG_USB_EHCI_HCD
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 #define CONFIG_USB_EHCI_FSL
--- a/include/configs/p2371-0000.h
+++ b/include/configs/p2371-0000.h
@@ -33,7 +33,6 @@
 #define CONFIG_SPI_FLASH_SIZE		(4 << 20)

 /* USB2.0 Host support */
-#define CONFIG_USB_EHCI_HCD
 #define CONFIG_USB_EHCI_TEGRA

 /* USB networking support */
--- a/include/configs/p2371-2180.h
+++ b/include/configs/p2371-2180.h
@@ -33,7 +33,6 @@
 #define CONFIG_SPI_FLASH_SIZE		(4 << 20)

 /* USB2.0 Host support */
-#define CONFIG_USB_EHCI_HCD
 #define CONFIG_USB_EHCI_TEGRA

 /* USB networking support */
--- a/include/configs/p2571.h
+++ b/include/configs/p2571.h
@@ -34,7 +34,6 @@
 #define CONFIG_SPI_FLASH_SIZE		(4 << 20)

 /* USB2.0 Host support */
-#define CONFIG_USB_EHCI_HCD
 #define CONFIG_USB_EHCI_TEGRA

 /* USB networking support */
--- a/include/configs/paz00.h
+++ b/include/configs/paz00.h
@@ -29,7 +29,6 @@
 #define CONFIG_SYS_MMC_ENV_PART 2

 /* USB Host support */
-#define CONFIG_USB_EHCI_HCD
 #define CONFIG_USB_EHCI_TEGRA

 /* USB networking support */
--- a/Show More
+++ b/Show More