diff options
| author | Tom Rini <trini@konsulko.com> | 2017-05-12 22:33:27 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-05-15 10:40:05 -0400 |
| commit | 8850c5d57c10aa6431d138d426e6e105c99cc7ba (patch) | |
| tree | 6f1e76b3b38dd2e2ff780a4919db43d3ab645867 /include/configs | |
| parent | 86a030791822d4ccc3ea3779b4af68bced555977 (diff) | |
Kconfig: USB: Migrate CONFIG_USB_EHCI to CONFIG_USB_EHCI_HCD
In order to be able to migrate the various SoC EHCI CONFIG options we
first need to finish the switch from CONFIG_USB_EHCI to
CONFIG_USB_EHCI_HCD.
Cc: Marek Vasut <marex@denx.de>
Signed-off-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Marek Vasut <marex@denx.de>
Diffstat (limited to 'include/configs')
140 files changed, 161 insertions, 161 deletions
diff --git a/include/configs/B4860QDS.h b/include/configs/B4860QDS.h index abfdbc9276..75d0a0805b 100644 --- a/include/configs/B4860QDS.h +++ b/include/configs/B4860QDS.h @@ -723,9 +723,9 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_HAS_FSL_DR_USB #ifdef CONFIG_HAS_FSL_DR_USB -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD -#ifdef CONFIG_USB_EHCI +#ifdef CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_FSL #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #endif diff --git a/include/configs/BSC9131RDB.h b/include/configs/BSC9131RDB.h index 6f333e75ef..e628a1a855 100644 --- a/include/configs/BSC9131RDB.h +++ b/include/configs/BSC9131RDB.h @@ -334,9 +334,9 @@ extern unsigned long get_sdram_size(void); #define CONFIG_SHA_HW_ACCEL #endif -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD -#ifdef CONFIG_USB_EHCI +#ifdef CONFIG_USB_EHCI_HCD #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_USB_EHCI_FSL #define CONFIG_HAS_FSL_DR_USB diff --git a/include/configs/BSC9132QDS.h b/include/configs/BSC9132QDS.h index 9097932581..af7fead715 100644 --- a/include/configs/BSC9132QDS.h +++ b/include/configs/BSC9132QDS.h @@ -476,8 +476,8 @@ combinations. this should be removed later #define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC85xx_ESDHC_ADDR #endif -#define CONFIG_USB_EHCI /* USB */ -#ifdef CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD /* USB */ +#ifdef CONFIG_USB_EHCI_HCD #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_USB_EHCI_FSL #define CONFIG_HAS_FSL_DR_USB diff --git a/include/configs/M52277EVB.h b/include/configs/M52277EVB.h index 7f5eecaad5..0ce78d5325 100644 --- a/include/configs/M52277EVB.h +++ b/include/configs/M52277EVB.h @@ -88,7 +88,7 @@ /* USB */ #ifdef CONFIG_CMD_USB -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_SYS_USB_EHCI_REGS_BASE 0xFC0B0000 #define CONFIG_SYS_USB_EHCI_CPU_INIT #endif diff --git a/include/configs/MPC8315ERDB.h b/include/configs/MPC8315ERDB.h index 493e3fa646..ab1e414211 100644 --- a/include/configs/MPC8315ERDB.h +++ b/include/configs/MPC8315ERDB.h @@ -366,7 +366,7 @@ #define CONFIG_HAS_FSL_DR_USB #define CONFIG_SYS_SCCR_USBDRCM 3 -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_FSL #define CONFIG_USB_PHY_TYPE "utmi" #define CONFIG_EHCI_HCD_INIT_AFTER_RESET diff --git a/include/configs/MPC8349ITX.h b/include/configs/MPC8349ITX.h index 719c27966a..14494dc555 100644 --- a/include/configs/MPC8349ITX.h +++ b/include/configs/MPC8349ITX.h @@ -148,7 +148,7 @@ /* * Support USB */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_FSL /* Current USB implementation supports the only USB controller, diff --git a/include/configs/MPC837XEMDS.h b/include/configs/MPC837XEMDS.h index 85b7c48fdf..ff75544bc3 100644 --- a/include/configs/MPC837XEMDS.h +++ b/include/configs/MPC837XEMDS.h @@ -376,7 +376,7 @@ 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 +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_FSL #define CONFIG_EHCI_HCD_INIT_AFTER_RESET diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h index d39dc1b465..2307693c31 100644 --- a/include/configs/MPC837XERDB.h +++ b/include/configs/MPC837XERDB.h @@ -651,7 +651,7 @@ #define CONFIG_ENV_OVERWRITE #define CONFIG_HAS_FSL_DR_USB -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_FSL #define CONFIG_EHCI_HCD_INIT_AFTER_RESET diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h index aeb9f0bbaf..219d359806 100644 --- a/include/configs/MPC8536DS.h +++ b/include/configs/MPC8536DS.h @@ -609,9 +609,9 @@ */ #define CONFIG_HAS_FSL_MPH_USB #ifdef CONFIG_HAS_FSL_MPH_USB -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD -#ifdef CONFIG_USB_EHCI +#ifdef CONFIG_USB_EHCI_HCD #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_USB_EHCI_FSL #endif diff --git a/include/configs/MPC8544DS.h b/include/configs/MPC8544DS.h index 8f7e056606..29f912e092 100644 --- a/include/configs/MPC8544DS.h +++ b/include/configs/MPC8544DS.h @@ -359,9 +359,9 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); /* * USB */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD -#ifdef CONFIG_USB_EHCI +#ifdef CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_PCI #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_PCI_EHCI_DEVICE 0 diff --git a/include/configs/MPC8572DS.h b/include/configs/MPC8572DS.h index e6aca11e50..4b5ffc0cbc 100644 --- a/include/configs/MPC8572DS.h +++ b/include/configs/MPC8572DS.h @@ -559,9 +559,9 @@ /* * USB */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD -#ifdef CONFIG_USB_EHCI +#ifdef CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_PCI #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_PCI_EHCI_DEVICE 0 diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h index 95b42208e9..126b662875 100644 --- a/include/configs/P1010RDB.h +++ b/include/configs/P1010RDB.h @@ -670,9 +670,9 @@ extern unsigned long get_sdram_size(void); #define CONFIG_HAS_FSL_DR_USB #if defined(CONFIG_HAS_FSL_DR_USB) -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD -#ifdef CONFIG_USB_EHCI +#ifdef CONFIG_USB_EHCI_HCD #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_USB_EHCI_FSL #endif @@ -733,7 +733,7 @@ extern unsigned long get_sdram_size(void); #undef CONFIG_WATCHDOG /* watchdog disabled */ -#if defined(CONFIG_MMC) || defined(CONFIG_USB_EHCI) \ +#if defined(CONFIG_MMC) || defined(CONFIG_USB_EHCI_HCD) \ || defined(CONFIG_FSL_SATA) #endif diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h index db66c309e7..2378b195c6 100644 --- a/include/configs/P1022DS.h +++ b/include/configs/P1022DS.h @@ -606,9 +606,9 @@ */ #define CONFIG_HAS_FSL_DR_USB #ifdef CONFIG_HAS_FSL_DR_USB -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD -#ifdef CONFIG_USB_EHCI +#ifdef CONFIG_USB_EHCI_HCD #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_USB_EHCI_FSL #endif diff --git a/include/configs/P1023RDB.h b/include/configs/P1023RDB.h index 787b8d206e..1a00985683 100644 --- a/include/configs/P1023RDB.h +++ b/include/configs/P1023RDB.h @@ -253,9 +253,9 @@ extern unsigned long get_clock_freq(void); */ #define CONFIG_HAS_FSL_DR_USB #ifdef CONFIG_HAS_FSL_DR_USB -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD -#ifdef CONFIG_USB_EHCI +#ifdef CONFIG_USB_EHCI_HCD #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_USB_EHCI_FSL #endif diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h index c3e3fae44f..6a40af9539 100644 --- a/include/configs/P2041RDB.h +++ b/include/configs/P2041RDB.h @@ -594,7 +594,7 @@ 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 +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_FSL #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #endif diff --git a/include/configs/T102xQDS.h b/include/configs/T102xQDS.h index 4da829d838..3cd636b9ba 100644 --- a/include/configs/T102xQDS.h +++ b/include/configs/T102xQDS.h @@ -637,7 +637,7 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_HAS_FSL_DR_USB #ifdef CONFIG_HAS_FSL_DR_USB -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_FSL #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #endif diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h index 3b55404cda..4dac070512 100644 --- a/include/configs/T102xRDB.h +++ b/include/configs/T102xRDB.h @@ -641,7 +641,7 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_HAS_FSL_DR_USB #ifdef CONFIG_HAS_FSL_DR_USB -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_FSL #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #endif diff --git a/include/configs/T1040QDS.h b/include/configs/T1040QDS.h index b2810b65f9..018cb732a3 100644 --- a/include/configs/T1040QDS.h +++ b/include/configs/T1040QDS.h @@ -527,9 +527,9 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_HAS_FSL_DR_USB #ifdef CONFIG_HAS_FSL_DR_USB -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD -#ifdef CONFIG_USB_EHCI +#ifdef CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_FSL #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #endif diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h index 5577408015..2d80deac20 100644 --- a/include/configs/T104xRDB.h +++ b/include/configs/T104xRDB.h @@ -637,9 +637,9 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg #define CONFIG_HAS_FSL_DR_USB #ifdef CONFIG_HAS_FSL_DR_USB -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD -#ifdef CONFIG_USB_EHCI +#ifdef CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_FSL #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #endif diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h index a32ddeed1d..affdd6bc77 100644 --- a/include/configs/T208xQDS.h +++ b/include/configs/T208xQDS.h @@ -12,7 +12,7 @@ #define __T208xQDS_H #define CONFIG_ICS307_REFCLK_HZ 25000000 /* ICS307 ref clk freq */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #if defined(CONFIG_ARCH_T2080) #define CONFIG_FSL_SATA_V2 #define CONFIG_SYS_SRIO /* Enable Serial RapidIO Support */ @@ -702,7 +702,7 @@ unsigned long get_board_ddr_clk(void); /* * USB */ -#ifdef CONFIG_USB_EHCI +#ifdef CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_FSL #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_HAS_FSL_DR_USB diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h index 90ce554035..c019a8f52c 100644 --- a/include/configs/T208xRDB.h +++ b/include/configs/T208xRDB.h @@ -12,7 +12,7 @@ #define __T2080RDB_H #define CONFIG_ICS307_REFCLK_HZ 25000000 /* ICS307 ref clk freq */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_FSL_SATA_V2 /* High Level Configuration Options */ @@ -652,7 +652,7 @@ unsigned long get_board_ddr_clk(void); /* * USB */ -#ifdef CONFIG_USB_EHCI +#ifdef CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_FSL #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_HAS_FSL_DR_USB diff --git a/include/configs/T4240QDS.h b/include/configs/T4240QDS.h index 9d4baaa79f..9ec1f829a0 100644 --- a/include/configs/T4240QDS.h +++ b/include/configs/T4240QDS.h @@ -507,7 +507,7 @@ unsigned long get_board_ddr_clk(void); /* * USB */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_FSL #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_HAS_FSL_DR_USB diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h index cc1f79940c..801215e919 100644 --- a/include/configs/T4240RDB.h +++ b/include/configs/T4240RDB.h @@ -685,7 +685,7 @@ unsigned long get_board_ddr_clk(void); /* * USB */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_FSL #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_HAS_FSL_DR_USB diff --git a/include/configs/UCP1020.h b/include/configs/UCP1020.h index c60743acd0..77abee77da 100644 --- a/include/configs/UCP1020.h +++ b/include/configs/UCP1020.h @@ -453,11 +453,11 @@ #define CONFIG_HAS_FSL_DR_USB #if defined(CONFIG_HAS_FSL_DR_USB) -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_MAX_CONTROLLER_COUNT 1 -#ifdef CONFIG_USB_EHCI +#ifdef CONFIG_USB_EHCI_HCD #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_USB_EHCI_FSL #endif diff --git a/include/configs/advantech_dms-ba16.h b/include/configs/advantech_dms-ba16.h index 52f8475669..681fee16b8 100644 --- a/include/configs/advantech_dms-ba16.h +++ b/include/configs/advantech_dms-ba16.h @@ -55,7 +55,7 @@ #define CONFIG_BOUNCE_BUFFER /* USB Configs */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_MX6 #define CONFIG_USB_STORAGE #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 diff --git a/include/configs/alt.h b/include/configs/alt.h index d8a66f2d7d..22fdf01f4a 100644 --- a/include/configs/alt.h +++ b/include/configs/alt.h @@ -81,7 +81,7 @@ #define CONFIG_SYS_I2C_POWERIC_ADDR 0x58 /* da9063 */ /* USB */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_RMOBILE #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 diff --git a/include/configs/apalis-tk1.h b/include/configs/apalis-tk1.h index c6c956e1ee..ab24018695 100644 --- a/include/configs/apalis-tk1.h +++ b/include/configs/apalis-tk1.h @@ -36,7 +36,7 @@ #define CONFIG_SYS_MMC_ENV_PART 1 /* USB host support */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_TEGRA /* PCI host support */ diff --git a/include/configs/apalis_t30.h b/include/configs/apalis_t30.h index e2acc6e8c9..75697e85c9 100644 --- a/include/configs/apalis_t30.h +++ b/include/configs/apalis_t30.h @@ -33,7 +33,7 @@ #define CONFIG_SYS_MMC_ENV_PART 1 /* USB host support */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_TEGRA /* PCI host support */ diff --git a/include/configs/aristainetos-common.h b/include/configs/aristainetos-common.h index 4d16d33585..42dc75ad1d 100644 --- a/include/configs/aristainetos-common.h +++ b/include/configs/aristainetos-common.h @@ -202,7 +202,7 @@ #define CONFIG_RTC_M41T11 /* USB Configs */ -#define CONFIG_USB_EHCI +#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 */ diff --git a/include/configs/at91sam9x5ek.h b/include/configs/at91sam9x5ek.h index 52a051a137..a5489cd28c 100644 --- a/include/configs/at91sam9x5ek.h +++ b/include/configs/at91sam9x5ek.h @@ -51,7 +51,7 @@ #define CONFIG_CMD_NAND /* - * define CONFIG_USB_EHCI to enable USB Hi-Speed (aka 2.0) + * define CONFIG_USB_EHCI_HCD to enable USB Hi-Speed (aka 2.0) * NB: in this case, USB 1.1 devices won't be recognized. */ @@ -99,7 +99,7 @@ /* USB */ #ifdef CONFIG_CMD_USB -#ifndef CONFIG_USB_EHCI +#ifndef CONFIG_USB_EHCI_HCD #define CONFIG_USB_ATMEL #define CONFIG_USB_ATMEL_CLK_SEL_UPLL #define CONFIG_USB_OHCI_NEW diff --git a/include/configs/beaver.h b/include/configs/beaver.h index cc32861169..2503750755 100644 --- a/include/configs/beaver.h +++ b/include/configs/beaver.h @@ -39,7 +39,7 @@ #define CONFIG_SPI_FLASH_SIZE (4 << 20) /* USB Host support */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_TEGRA /* USB networking support */ diff --git a/include/configs/cardhu.h b/include/configs/cardhu.h index e338f9bdd2..3240c37866 100644 --- a/include/configs/cardhu.h +++ b/include/configs/cardhu.h @@ -43,7 +43,7 @@ #define CONFIG_SPI_FLASH_SIZE (4 << 20) /* USB Host support */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_TEGRA /* USB networking support */ diff --git a/include/configs/cei-tk1-som.h b/include/configs/cei-tk1-som.h index 8185926590..8a3714bf83 100644 --- a/include/configs/cei-tk1-som.h +++ b/include/configs/cei-tk1-som.h @@ -38,7 +38,7 @@ #define CONFIG_SPI_FLASH_SIZE (4 << 20) /* USB Host support */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_TEGRA /* USB networking support */ diff --git a/include/configs/cgtqmx6eval.h b/include/configs/cgtqmx6eval.h index e05db3ed8a..117672d41b 100644 --- a/include/configs/cgtqmx6eval.h +++ b/include/configs/cgtqmx6eval.h @@ -61,7 +61,7 @@ #define CONFIG_POWER_PFUZE100_I2C_ADDR 0x08 /* USB Configs */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_MX6 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_USB_HOST_ETHER diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h index 78f8e5d8d5..e1ea0d702a 100644 --- a/include/configs/cm_t35.h +++ b/include/configs/cm_t35.h @@ -75,7 +75,7 @@ /* USB */ #define CONFIG_USB_OMAP3 -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_OMAP #define CONFIG_USB_MUSB_UDC #define CONFIG_TWL4030_USB diff --git a/include/configs/cm_t3517.h b/include/configs/cm_t3517.h index d157f24056..55e543ad68 100644 --- a/include/configs/cm_t3517.h +++ b/include/configs/cm_t3517.h @@ -84,7 +84,7 @@ #ifndef CONFIG_USB_MUSB_AM35X #define CONFIG_USB_OMAP3 -#define CONFIG_USB_EHCI +#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 diff --git a/include/configs/cm_t54.h b/include/configs/cm_t54.h index d7e7c29298..ba35c18e5b 100644 --- a/include/configs/cm_t54.h +++ b/include/configs/cm_t54.h @@ -58,7 +58,7 @@ #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 +#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 diff --git a/include/configs/colibri_t20.h b/include/configs/colibri_t20.h index 023e75cf33..5c9df55828 100644 --- a/include/configs/colibri_t20.h +++ b/include/configs/colibri_t20.h @@ -25,7 +25,7 @@ #define CONFIG_SYS_I2C_TEGRA /* USB host support */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_TEGRA #define CONFIG_USB_MAX_CONTROLLER_COUNT 3 diff --git a/include/configs/colibri_t30.h b/include/configs/colibri_t30.h index bc1904418d..92caebcbef 100644 --- a/include/configs/colibri_t30.h +++ b/include/configs/colibri_t30.h @@ -33,7 +33,7 @@ #define CONFIG_SYS_MMC_ENV_PART 1 /* USB host support */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_TEGRA /* USB networking support */ diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h index c7f174839f..ee491b8744 100644 --- a/include/configs/colibri_vf.h +++ b/include/configs/colibri_vf.h @@ -191,7 +191,7 @@ #endif /* USB Host Support */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_VF #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET diff --git a/include/configs/controlcenterd.h b/include/configs/controlcenterd.h index b52f300af9..9f8c4addbf 100644 --- a/include/configs/controlcenterd.h +++ b/include/configs/controlcenterd.h @@ -291,7 +291,7 @@ /* * USB */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_HAS_FSL_DR_USB #define CONFIG_USB_EHCI_FSL diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h index f42ba795ea..725d854131 100644 --- a/include/configs/corenet_ds.h +++ b/include/configs/corenet_ds.h @@ -608,7 +608,7 @@ #define CONFIG_HAS_FSL_MPH_USB #if defined(CONFIG_HAS_FSL_DR_USB) || defined(CONFIG_HAS_FSL_MPH_USB) -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_FSL #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #endif diff --git a/include/configs/corvus.h b/include/configs/corvus.h index bb1d0d7715..371547a5e4 100644 --- a/include/configs/corvus.h +++ b/include/configs/corvus.h @@ -96,7 +96,7 @@ #define CONFIG_AT91_WANTS_COMMON_PHY /* USB */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_ATMEL #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 2 diff --git a/include/configs/cyrus.h b/include/configs/cyrus.h index 904da1a8ac..a33550cc3e 100644 --- a/include/configs/cyrus.h +++ b/include/configs/cyrus.h @@ -426,7 +426,7 @@ #define CONFIG_HAS_FSL_MPH_USB #if defined(CONFIG_HAS_FSL_DR_USB) || defined(CONFIG_HAS_FSL_MPH_USB) -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_FSL #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_EHCI_IS_TDI diff --git a/include/configs/dalmore.h b/include/configs/dalmore.h index f3ff9e7494..072af48630 100644 --- a/include/configs/dalmore.h +++ b/include/configs/dalmore.h @@ -35,7 +35,7 @@ #define CONFIG_SPI_FLASH_SIZE (4 << 20) /* USB Host support */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_TEGRA /* USB networking support */ diff --git a/include/configs/ds414.h b/include/configs/ds414.h index d1d4bf0156..c2ddaa027f 100644 --- a/include/configs/ds414.h +++ b/include/configs/ds414.h @@ -74,7 +74,7 @@ #endif #if !defined(CONFIG_USB_XHCI_HCD) -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_MARVELL #define CONFIG_EHCI_IS_TDI #endif diff --git a/include/configs/duovero.h b/include/configs/duovero.h index 4bb81e5d9c..a58c15c966 100644 --- a/include/configs/duovero.h +++ b/include/configs/duovero.h @@ -25,7 +25,7 @@ #define CONFIG_SYS_DEFAULT_LPDDR2_TIMINGS /* USB UHH support options */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_OMAP #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3 diff --git a/include/configs/e2220-1170.h b/include/configs/e2220-1170.h index b6a758f0b2..98fe6c601b 100644 --- a/include/configs/e2220-1170.h +++ b/include/configs/e2220-1170.h @@ -33,7 +33,7 @@ #define CONFIG_SPI_FLASH_SIZE (4 << 20) /* USB2.0 Host support */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_TEGRA /* USB networking support */ diff --git a/include/configs/eco5pk.h b/include/configs/eco5pk.h index 03cc74c596..13fde3915e 100644 --- a/include/configs/eco5pk.h +++ b/include/configs/eco5pk.h @@ -15,7 +15,7 @@ #include "tam3517-common.h" -#undef CONFIG_USB_EHCI +#undef CONFIG_USB_EHCI_HCD #undef CONFIG_USB_EHCI_OMAP #undef CONFIG_USB_OMAP3 diff --git a/include/configs/edminiv2.h b/include/configs/edminiv2.h index f7ac3027dd..1b17cccce2 100644 --- a/include/configs/edminiv2.h +++ b/include/configs/edminiv2.h @@ -171,7 +171,7 @@ * Common USB/EHCI configuration */ #ifdef CONFIG_CMD_USB -#define CONFIG_USB_EHCI /* Enable EHCI USB support */ +#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 diff --git a/include/configs/embestmx6boards.h b/include/configs/embestmx6boards.h index 68d48b2e6a..2de0eb31a9 100644 --- a/include/configs/embestmx6boards.h +++ b/include/configs/embestmx6boards.h @@ -35,7 +35,7 @@ #define CONFIG_SYS_I2C_SPEED 100000 /* USB Configs */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_MX6 #define CONFIG_USB_HOST_ETHER #define CONFIG_USB_ETHER_ASIX diff --git a/include/configs/exynos5250-common.h b/include/configs/exynos5250-common.h index aee9fea9da..9adce94d55 100644 --- a/include/configs/exynos5250-common.h +++ b/include/configs/exynos5250-common.h @@ -26,7 +26,7 @@ #define CONFIG_SYS_INIT_SP_ADDR CONFIG_IRAM_STACK /* USB */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_EXYNOS #define CONFIG_USB_XHCI_EXYNOS diff --git a/include/configs/ge_bx50v3.h b/include/configs/ge_bx50v3.h index 776910c6cd..f1eb63ac74 100644 --- a/include/configs/ge_bx50v3.h +++ b/include/configs/ge_bx50v3.h @@ -68,7 +68,7 @@ /* USB Configs */ #ifdef CONFIG_USB -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_MX6 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET diff --git a/include/configs/gose.h b/include/configs/gose.h index 8956841fbe..2b0766e88e 100644 --- a/include/configs/gose.h +++ b/include/configs/gose.h @@ -78,7 +78,7 @@ #define CONFIG_SYS_I2C_POWERIC_ADDR 0x58 /* da9063 */ /* USB */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_RMOBILE #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 diff --git a/include/configs/gplugd.h b/include/configs/gplugd.h index 3ec7649a1d..f2ce28fdb9 100644 --- a/include/configs/gplugd.h +++ b/include/configs/gplugd.h @@ -82,7 +82,7 @@ #define CONFIG_ENV_SIZE 0x4000 #ifdef CONFIG_CMD_USB -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_ARMADA100 #define CONFIG_EHCI_IS_TDI #endif /* CONFIG_CMD_USB */ diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h index 92eded6cda..6ef07898f5 100644 --- a/include/configs/gw_ventana.h +++ b/include/configs/gw_ventana.h @@ -156,7 +156,7 @@ #define CONFIG_ARP_TIMEOUT 200UL /* USB Configs */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_MX6 #define CONFIG_USB_HOST_ETHER #define CONFIG_USB_ETHER_ASIX diff --git a/include/configs/harmony.h b/include/configs/harmony.h index 1a5d4b1dd5..8cd7cb583a 100644 --- a/include/configs/harmony.h +++ b/include/configs/harmony.h @@ -36,7 +36,7 @@ #define CONFIG_ENV_OFFSET (SZ_512M - SZ_128K) /* 128K sector size */ /* USB Host support */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_TEGRA /* USB networking support */ diff --git a/include/configs/jetson-tk1.h b/include/configs/jetson-tk1.h index b31ba6a4ee..08d8272d84 100644 --- a/include/configs/jetson-tk1.h +++ b/include/configs/jetson-tk1.h @@ -34,7 +34,7 @@ #define CONFIG_SPI_FLASH_SIZE (4 << 20) /* USB Host support */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_TEGRA /* USB networking support */ diff --git a/include/configs/koelsch.h b/include/configs/koelsch.h index 1ca564f983..5f838618dd 100644 --- a/include/configs/koelsch.h +++ b/include/configs/koelsch.h @@ -78,7 +78,7 @@ #define CONFIG_SYS_I2C_POWERIC_ADDR 0x58 /* da9063 */ /* USB */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_RMOBILE #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 diff --git a/include/configs/lager.h b/include/configs/lager.h index b619d153c9..6268beec02 100644 --- a/include/configs/lager.h +++ b/include/configs/lager.h @@ -80,7 +80,7 @@ #define CONFIG_SYS_TMU_CLK_DIV 4 /* USB */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_RMOBILE #define CONFIG_USB_MAX_CONTROLLER_COUNT 3 diff --git a/include/configs/liteboard.h b/include/configs/liteboard.h index 2294106802..0b4ac4af06 100644 --- a/include/configs/liteboard.h +++ b/include/configs/liteboard.h @@ -137,7 +137,7 @@ /* USB Configs */ #ifdef CONFIG_CMD_USB -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_MX6 #define CONFIG_USB_STORAGE #define CONFIG_EHCI_HCD_INIT_AFTER_RESET diff --git a/include/configs/ls1012aqds.h b/include/configs/ls1012aqds.h index 8d7e54305d..a8e1843910 100644 --- a/include/configs/ls1012aqds.h +++ b/include/configs/ls1012aqds.h @@ -115,7 +115,7 @@ /*#define CONFIG_HAS_FSL_DR_USB*/ #ifdef CONFIG_HAS_FSL_DR_USB -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_FSL #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #endif diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h index 373de40d29..d13517cee3 100644 --- a/include/configs/ls1021aqds.h +++ b/include/configs/ls1021aqds.h @@ -402,7 +402,7 @@ unsigned long get_board_ddr_clk(void); /*#define CONFIG_HAS_FSL_DR_USB*/ #ifdef CONFIG_HAS_FSL_DR_USB -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_FSL #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #endif diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h index 1ff3d9ee9e..7f9357f329 100644 --- a/include/configs/ls1021atwr.h +++ b/include/configs/ls1021atwr.h @@ -40,7 +40,7 @@ /*#define CONFIG_HAS_FSL_DR_USB*/ #ifdef CONFIG_HAS_FSL_DR_USB -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_FSL #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #endif diff --git a/include/configs/lwmon5.h b/include/configs/lwmon5.h index 911192da7a..a1779a7ab8 100644 --- a/include/configs/lwmon5.h +++ b/include/configs/lwmon5.h @@ -362,7 +362,7 @@ /* * USB/EHCI */ -#define CONFIG_USB_EHCI /* Enable EHCI USB support */ +#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 diff --git a/include/configs/m53evk.h b/include/configs/m53evk.h index d85de5fa17..395635b372 100644 --- a/include/configs/m53evk.h +++ b/include/configs/m53evk.h @@ -162,7 +162,7 @@ * USB */ #ifdef CONFIG_CMD_USB -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_MX5 #define CONFIG_USB_HOST_ETHER #define CONFIG_USB_ETHER_ASIX diff --git a/include/configs/ma5d4evk.h b/include/configs/ma5d4evk.h index db58f735bc..cde3a6653b 100644 --- a/include/configs/ma5d4evk.h +++ b/include/configs/ma5d4evk.h @@ -102,7 +102,7 @@ * USB */ #ifdef CONFIG_CMD_USB -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_ATMEL #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3 diff --git a/include/configs/mccmon6.h b/include/configs/mccmon6.h index 9e5c29f92f..8c8ab7c478 100644 --- a/include/configs/mccmon6.h +++ b/include/configs/mccmon6.h @@ -98,7 +98,7 @@ "128k@0x19C0000(swupdate-kernel-dtb.nor)" /* USB Configs */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_MX6 #define CONFIG_USB_STORAGE #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 diff --git a/include/configs/medcom-wide.h b/include/configs/medcom-wide.h index b9b666fd3e..b67c26bce7 100644 --- a/include/configs/medcom-wide.h +++ b/include/configs/medcom-wide.h @@ -29,7 +29,7 @@ #define CONFIG_ENV_OFFSET (SZ_512M - SZ_128K) /* 128K sectors */ /* USB host support */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_TEGRA /* USB networking support */ diff --git a/include/configs/mpc5121ads.h b/include/configs/mpc5121ads.h index dafb724e3f..9f6d10edbb 100644 --- a/include/configs/mpc5121ads.h +++ b/include/configs/mpc5121ads.h @@ -369,7 +369,7 @@ */ #if defined(CONFIG_CMD_USB) -#define CONFIG_USB_EHCI /* Enable EHCI Support */ +#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 diff --git a/include/configs/mv-common.h b/include/configs/mv-common.h index 814f0dd7ca..5146f9b9f6 100644 --- a/include/configs/mv-common.h +++ b/include/configs/mv-common.h @@ -121,7 +121,7 @@ * Common USB/EHCI configuration */ #if defined(CONFIG_CMD_USB) && !defined(CONFIG_DM) -#define CONFIG_USB_EHCI /* Enable EHCI USB support */ +#define CONFIG_USB_EHCI_HCD /* Enable EHCI USB support */ #define CONFIG_SUPPORT_VFAT #endif /* CONFIG_CMD_USB */ diff --git a/include/configs/mx35pdk.h b/include/configs/mx35pdk.h index 79d92bb06a..e49578e02b 100644 --- a/include/configs/mx35pdk.h +++ b/include/configs/mx35pdk.h @@ -199,7 +199,7 @@ #define CONFIG_SYS_NAND_LARGEPAGE /* EHCI driver */ -#define CONFIG_USB_EHCI +#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 diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h index dfd7ea9d45..d9fb66580f 100644 --- a/include/configs/mx51evk.h +++ b/include/configs/mx51evk.h @@ -73,7 +73,7 @@ #define CONFIG_FEC_MXC_PHYADDR 0x1F /* USB Configs */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_MX5 #define CONFIG_USB_HOST_ETHER #define CONFIG_USB_ETHER_ASIX diff --git a/include/configs/mx53cx9020.h b/include/configs/mx53cx9020.h index 3094402d15..c61ed89b6f 100644 --- a/include/configs/mx53cx9020.h +++ b/include/configs/mx53cx9020.h @@ -45,7 +45,7 @@ #define CONFIG_FEC_MXC_PHYADDR 0x1F /* USB Configs */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_MX5 #define CONFIG_USB_STORAGE #define CONFIG_USB_HOST_ETHER diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h index 945be5835b..600b9d4ea1 100644 --- a/include/configs/mx53loco.h +++ b/include/configs/mx53loco.h @@ -42,7 +42,7 @@ #define CONFIG_FEC_MXC_PHYADDR 0x1F /* USB Configs */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_MX5 #define CONFIG_USB_HOST_ETHER #define CONFIG_USB_ETHER_ASIX diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h index 84fdf656cd..5d8b6d8fea 100644 --- a/include/configs/mx6cuboxi.h +++ b/include/configs/mx6cuboxi.h @@ -44,7 +44,7 @@ #define CONFIG_IMX_VIDEO_SKIP /* USB */ -#define CONFIG_USB_EHCI +#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) diff --git a/include/configs/mx6qarm2.h b/include/configs/mx6qarm2.h index 9f42735571..7e329d682d 100644 --- a/include/configs/mx6qarm2.h +++ b/include/configs/mx6qarm2.h @@ -128,7 +128,7 @@ /* USB Configs */ #ifdef CONFIG_CMD_USB -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_MX6 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_USB_HOST_ETHER diff --git a/include/configs/mx6qsabreauto.h b/include/configs/mx6qsabreauto.h index ef7675c688..44757c2757 100644 --- a/include/configs/mx6qsabreauto.h +++ b/include/configs/mx6qsabreauto.h @@ -15,7 +15,7 @@ #define CONFIG_MMCROOT "/dev/mmcblk0p2" /* USB Configs */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_MX6 #define CONFIG_USB_HOST_ETHER #define CONFIG_USB_ETHER_ASIX diff --git a/include/configs/mx6sabresd.h b/include/configs/mx6sabresd.h index 598ab9aa2e..702706deed 100644 --- a/include/configs/mx6sabresd.h +++ b/include/configs/mx6sabresd.h @@ -63,7 +63,7 @@ /* USB Configs */ #ifdef CONFIG_CMD_USB -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_MX6 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_USB_HOST_ETHER diff --git a/include/configs/mx6slevk.h b/include/configs/mx6slevk.h index 2fff7995ea..f45b8d06bd 100644 --- a/include/configs/mx6slevk.h +++ b/include/configs/mx6slevk.h @@ -159,7 +159,7 @@ /* USB Configs */ #ifdef CONFIG_CMD_USB -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_MX6 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_USB_HOST_ETHER diff --git a/include/configs/mx6sxsabreauto.h b/include/configs/mx6sxsabreauto.h index 971f6c2f31..33354c3a9c 100644 --- a/include/configs/mx6sxsabreauto.h +++ b/include/configs/mx6sxsabreauto.h @@ -149,7 +149,7 @@ #define CONFIG_PHY_ATHEROS #ifdef CONFIG_CMD_USB -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_MX6 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_USB_HOST_ETHER diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h index dafa946e47..93a2bdaaa8 100644 --- a/include/configs/mx6sxsabresd.h +++ b/include/configs/mx6sxsabresd.h @@ -167,7 +167,7 @@ #define CONFIG_PHY_ATHEROS #ifdef CONFIG_CMD_USB -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_MX6 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_USB_HOST_ETHER diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h index 240d3a226c..86a7b97512 100644 --- a/include/configs/mx6ul_14x14_evk.h +++ b/include/configs/mx6ul_14x14_evk.h @@ -186,7 +186,7 @@ /* USB Configs */ #ifdef CONFIG_CMD_USB -#define CONFIG_USB_EHCI +#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) diff --git a/include/configs/mxs.h b/include/configs/mxs.h index fdf596f82f..17e1bbca1f 100644 --- a/include/configs/mxs.h +++ b/include/configs/mxs.h @@ -168,7 +168,7 @@ /* USB */ #ifdef CONFIG_CMD_USB -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_MXS #define CONFIG_EHCI_IS_TDI #endif diff --git a/include/configs/nas220.h b/include/configs/nas220.h index 861cb5df57..84d706caf9 100644 --- a/include/configs/nas220.h +++ b/include/configs/nas220.h @@ -94,7 +94,7 @@ * USB/EHCI */ #ifdef CONFIG_CMD_USB -#define CONFIG_USB_EHCI /* Enable EHCI USB support */ +#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 diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h index cacc1b81f0..f450b71e43 100644 --- a/include/configs/nitrogen6x.h +++ b/include/configs/nitrogen6x.h @@ -74,7 +74,7 @@ #define CONFIG_PHY_MICREL_KSZ9021 /* USB Configs */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_MX6 #define CONFIG_USB_HOST_ETHER #define CONFIG_USB_ETHER_ASIX diff --git a/include/configs/novena.h b/include/configs/novena.h index df0efbca92..590c1211f2 100644 --- a/include/configs/novena.h +++ b/include/configs/novena.h @@ -135,7 +135,7 @@ /* USB Configs */ #ifdef CONFIG_CMD_USB -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_MX6 #define CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP #define CONFIG_USB_HOST_ETHER diff --git a/include/configs/nyan-big.h b/include/configs/nyan-big.h index d9d4f2d583..249af9979c 100644 --- a/include/configs/nyan-big.h +++ b/include/configs/nyan-big.h @@ -39,7 +39,7 @@ #define CONFIG_SPI_FLASH_SIZE (4 << 20) /* USB Host support */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_TEGRA /* USB networking support */ diff --git a/include/configs/odroid.h b/include/configs/odroid.h index 6cc7dd16a2..899ca5e887 100644 --- a/include/configs/odroid.h +++ b/include/configs/odroid.h @@ -188,7 +188,7 @@ #define CONFIG_LIB_HW_RAND /* USB */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_EXYNOS #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3 diff --git a/include/configs/odroid_xu3.h b/include/configs/odroid_xu3.h index 40b48f70ab..8469839b18 100644 --- a/include/configs/odroid_xu3.h +++ b/include/configs/odroid_xu3.h @@ -41,7 +41,7 @@ #define CONFIG_DEFAULT_CONSOLE "console=ttySAC2,115200n8\0" /* USB */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_EXYNOS /* DFU */ diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h index c91d0935ba..93aa17ed47 100644 --- a/include/configs/omap3_beagle.h +++ b/include/configs/omap3_beagle.h @@ -55,7 +55,7 @@ #define CONFIG_FASTBOOT_BUF_SIZE 0x07000000 /* USB EHCI */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_OMAP #define CONFIG_OMAP_EHCI_PHY1_RESET_GPIO 147 diff --git a/include/configs/omap3_overo.h b/include/configs/omap3_overo.h index 40107e4216..447ab47296 100644 --- a/include/configs/omap3_overo.h +++ b/include/configs/omap3_overo.h @@ -40,7 +40,7 @@ #define CONFIG_TWL4030_LED /* USB EHCI */ -#define CONFIG_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 diff --git a/include/configs/omap4_panda.h b/include/configs/omap4_panda.h index a6078daca6..967f2fa84e 100644 --- a/include/configs/omap4_panda.h +++ b/include/configs/omap4_panda.h @@ -17,7 +17,7 @@ */ /* USB UHH support options */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_OMAP #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3 diff --git a/include/configs/omap5_uevm.h b/include/configs/omap5_uevm.h index 6ac5d506f6..522df942c3 100644 --- a/include/configs/omap5_uevm.h +++ b/include/configs/omap5_uevm.h @@ -52,7 +52,7 @@ #define CONFIG_SYS_I2C_TCA642X_ADDR 0x22 /* USB UHH support options */ -#define CONFIG_USB_EHCI +#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 diff --git a/include/configs/ot1200.h b/include/configs/ot1200.h index b4d2b0a871..cfa6199d95 100644 --- a/include/configs/ot1200.h +++ b/include/configs/ot1200.h @@ -55,7 +55,7 @@ #define CONFIG_SYS_FSL_USDHC_NUM 2 /* USB Configs */ -#define CONFIG_USB_EHCI +#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 diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index d995d0448c..d3b3fb676a 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -823,9 +823,9 @@ #define CONFIG_HAS_FSL_DR_USB #if defined(CONFIG_HAS_FSL_DR_USB) -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD -#ifdef CONFIG_USB_EHCI +#ifdef CONFIG_USB_EHCI_HCD #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_USB_EHCI_FSL #endif diff --git a/include/configs/p1_twr.h b/include/configs/p1_twr.h index dad0616517..1c05926efc 100644 --- a/include/configs/p1_twr.h +++ b/include/configs/p1_twr.h @@ -394,9 +394,9 @@ 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 +#define CONFIG_USB_EHCI_HCD -#ifdef CONFIG_USB_EHCI +#ifdef CONFIG_USB_EHCI_HCD #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_USB_EHCI_FSL #endif diff --git a/include/configs/p2371-0000.h b/include/configs/p2371-0000.h index 897add3dd0..b5ef933bc1 100644 --- a/include/configs/p2371-0000.h +++ b/include/configs/p2371-0000.h @@ -33,7 +33,7 @@ #define CONFIG_SPI_FLASH_SIZE (4 << 20) /* USB2.0 Host support */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_TEGRA /* USB networking support */ diff --git a/include/configs/p2371-2180.h b/include/configs/p2371-2180.h index 3cf0c87be4..fb57a17ded 100644 --- a/include/configs/p2371-2180.h +++ b/include/configs/p2371-2180.h @@ -33,7 +33,7 @@ #define CONFIG_SPI_FLASH_SIZE (4 << 20) /* USB2.0 Host support */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_TEGRA /* USB networking support */ diff --git a/include/configs/p2571.h b/include/configs/p2571.h index 76fb7cec87..b496c61938 100644 --- a/include/configs/p2571.h +++ b/include/configs/p2571.h @@ -34,7 +34,7 @@ #define CONFIG_SPI_FLASH_SIZE (4 << 20) /* USB2.0 Host support */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_TEGRA /* USB networking support */ diff --git a/include/configs/paz00.h b/include/configs/paz00.h index 2e8cbd94cf..13485045f2 100644 --- a/include/configs/paz00.h +++ b/include/configs/paz00.h @@ -29,7 +29,7 @@ #define CONFIG_SYS_MMC_ENV_PART 2 /* USB Host support */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_TEGRA /* USB networking support */ diff --git a/include/configs/pico-imx6ul.h b/include/configs/pico-imx6ul.h index 26b1b1147c..d3fe63fa65 100644 --- a/include/configs/pico-imx6ul.h +++ b/include/configs/pico-imx6ul.h @@ -37,7 +37,7 @@ #define CONFIG_SUPPORT_EMMC_BOOT /* USB Configs */ -#define CONFIG_USB_EHCI +#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) diff --git a/include/configs/picosam9g45.h b/include/configs/picosam9g45.h index 733768aa7b..02940267bc 100644 --- a/include/configs/picosam9g45.h +++ b/include/configs/picosam9g45.h @@ -98,7 +98,7 @@ #define CONFIG_AT91_WANTS_COMMON_PHY /* USB */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_ATMEL #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 2 diff --git a/include/configs/platinum.h b/include/configs/platinum.h index 6687c38c99..53a130aa36 100644 --- a/include/configs/platinum.h +++ b/include/configs/platinum.h @@ -52,7 +52,7 @@ #define CONFIG_PHYLIB /* USB config */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_MX6 #define CONFIG_MXC_USB_PORT 1 #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) diff --git a/include/configs/plutux.h b/include/configs/plutux.h index 911cad8cdd..1db2e9b62f 100644 --- a/include/configs/plutux.h +++ b/include/configs/plutux.h @@ -29,7 +29,7 @@ #define CONFIG_ENV_OFFSET (SZ_512M - SZ_128K) /* 128K sectors */ /* USB host support */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_TEGRA /* USB networking support */ diff --git a/include/configs/porter.h b/include/configs/porter.h index fabab73680..827c7b249a 100644 --- a/include/configs/porter.h +++ b/include/configs/porter.h @@ -82,7 +82,7 @@ #define CONFIG_SYS_I2C_POWERIC_ADDR 0x58 /* da9063 */ /* USB */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_RMOBILE #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 diff --git a/include/configs/sama5d2_ptc.h b/include/configs/sama5d2_ptc.h index 16bafc0990..0112968828 100644 --- a/include/configs/sama5d2_ptc.h +++ b/include/configs/sama5d2_ptc.h @@ -66,7 +66,7 @@ #define CONFIG_CMD_USB #ifdef CONFIG_CMD_USB -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_ATMEL #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3 #endif diff --git a/include/configs/seaboard.h b/include/configs/seaboard.h index 207b59118d..9c11fe29f6 100644 --- a/include/configs/seaboard.h +++ b/include/configs/seaboard.h @@ -37,7 +37,7 @@ #define CONFIG_SYS_MMC_ENV_PART 2 /* USB Host support */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_TEGRA /* USB networking support */ diff --git a/include/configs/sequoia.h b/include/configs/sequoia.h index f5b03caf83..cf62a95246 100644 --- a/include/configs/sequoia.h +++ b/include/configs/sequoia.h @@ -193,15 +193,15 @@ /* USB */ #ifdef CONFIG_440EPX -#undef CONFIG_USB_EHCI /* OHCI by default */ +#undef CONFIG_USB_EHCI_HCD /* OHCI by default */ -#ifdef CONFIG_USB_EHCI +#ifdef CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_PPC4XX #define CONFIG_SYS_PPC4XX_USB_ADDR 0xe0000300 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_EHCI_MMIO_BIG_ENDIAN #define CONFIG_EHCI_DESC_BIG_ENDIAN -#else /* CONFIG_USB_EHCI */ +#else /* CONFIG_USB_EHCI_HCD */ #define CONFIG_USB_OHCI_NEW #define CONFIG_SYS_OHCI_BE_CONTROLLER diff --git a/include/configs/silk.h b/include/configs/silk.h index 4fc270fcc2..38febae249 100644 --- a/include/configs/silk.h +++ b/include/configs/silk.h @@ -82,7 +82,7 @@ #define CONFIG_SYS_I2C_POWERIC_ADDR 0x58 /* da9063 */ /* USB */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_RMOBILE #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 diff --git a/include/configs/snapper9g45.h b/include/configs/snapper9g45.h index 952c6f546f..56a6aad818 100644 --- a/include/configs/snapper9g45.h +++ b/include/configs/snapper9g45.h @@ -61,7 +61,7 @@ #define CONFIG_TFTP_TSIZE /* USB */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_ATMEL #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 2 diff --git a/include/configs/stout.h b/include/configs/stout.h index 90258c2f42..ac63e53b08 100644 --- a/include/configs/stout.h +++ b/include/configs/stout.h @@ -84,7 +84,7 @@ #define CONFIG_SYS_TMU_CLK_DIV 4 /* USB */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_RMOBILE #define CONFIG_USB_MAX_CONTROLLER_COUNT 3 diff --git a/include/configs/sun4i.h b/include/configs/sun4i.h index 3dfd95ad77..bd349694c6 100644 --- a/include/configs/sun4i.h +++ b/include/configs/sun4i.h @@ -12,7 +12,7 @@ * A10 specific configuration */ -#ifdef CONFIG_USB_EHCI +#ifdef CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_SUNXI #endif diff --git a/include/configs/sun50i.h b/include/configs/sun50i.h index 1b7bfb6c22..b7b67a1ddc 100644 --- a/include/configs/sun50i.h +++ b/include/configs/sun50i.h @@ -11,7 +11,7 @@ * A64 specific configuration */ -#ifdef CONFIG_USB_EHCI +#ifdef CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_SUNXI #define CONFIG_USB_MAX_CONTROLLER_COUNT 1 #endif diff --git a/include/configs/sun5i.h b/include/configs/sun5i.h index ec8f3199ba..0535d6a7f3 100644 --- a/include/configs/sun5i.h +++ b/include/configs/sun5i.h @@ -12,7 +12,7 @@ * High Level Configuration Options */ -#ifdef CONFIG_USB_EHCI +#ifdef CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_SUNXI #endif diff --git a/include/configs/sun6i.h b/include/configs/sun6i.h index 6c1eca4d26..8b9adb1be6 100644 --- a/include/configs/sun6i.h +++ b/include/configs/sun6i.h @@ -15,7 +15,7 @@ * A31 specific configuration */ -#ifdef CONFIG_USB_EHCI +#ifdef CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_SUNXI #endif diff --git a/include/configs/sun7i.h b/include/configs/sun7i.h index 5455901efe..12c96230c2 100644 --- a/include/configs/sun7i.h +++ b/include/configs/sun7i.h @@ -13,7 +13,7 @@ * A20 specific configuration */ -#ifdef CONFIG_USB_EHCI +#ifdef CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_SUNXI #endif diff --git a/include/configs/sun8i.h b/include/configs/sun8i.h index 6ac42acaea..47f2813240 100644 --- a/include/configs/sun8i.h +++ b/include/configs/sun8i.h @@ -13,7 +13,7 @@ * A23 specific configuration */ -#ifdef CONFIG_USB_EHCI +#ifdef CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_SUNXI #endif diff --git a/include/configs/tao3530.h b/include/configs/tao3530.h index 834fe174d6..de44aa5cf7 100644 --- a/include/configs/tao3530.h +++ b/include/configs/tao3530.h @@ -228,7 +228,7 @@ */ /* USB EHCI */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_OMAP #define CONFIG_OMAP_EHCI_PHY1_RESET_GPIO 162 diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h index b4a14eae7c..d297c27506 100644 --- a/include/configs/tbs2910.h +++ b/include/configs/tbs2910.h @@ -93,7 +93,7 @@ /* USB */ #ifdef CONFIG_CMD_USB -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_MX6 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET diff --git a/include/configs/tec-ng.h b/include/configs/tec-ng.h index 06d8720df2..decf8ba682 100644 --- a/include/configs/tec-ng.h +++ b/include/configs/tec-ng.h @@ -33,7 +33,7 @@ #define CONFIG_SPI_FLASH_SIZE (4 << 20) /* USB Host support */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_TEGRA /* USB networking support */ diff --git a/include/configs/tec.h b/include/configs/tec.h index b380a69bdf..e3add13dbf 100644 --- a/include/configs/tec.h +++ b/include/configs/tec.h @@ -29,7 +29,7 @@ #define CONFIG_ENV_OFFSET (SZ_512M - SZ_128K) /* 128K sectors */ /* USB host support */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_TEGRA /* USB networking support */ diff --git a/include/configs/tegra-common-post.h b/include/configs/tegra-common-post.h index ab4136ab13..568236c842 100644 --- a/include/configs/tegra-common-post.h +++ b/include/configs/tegra-common-post.h @@ -123,8 +123,8 @@ #endif /* remove USB */ -#ifdef CONFIG_USB_EHCI -#undef CONFIG_USB_EHCI +#ifdef CONFIG_USB_EHCI_HCD +#undef CONFIG_USB_EHCI_HCD #endif #ifdef CONFIG_USB_EHCI_TEGRA #undef CONFIG_USB_EHCI_TEGRA diff --git a/include/configs/titanium.h b/include/configs/titanium.h index 2c05f9c930..0dedffd746 100644 --- a/include/configs/titanium.h +++ b/include/configs/titanium.h @@ -50,7 +50,7 @@ #define CONFIG_PHY_MICREL_KSZ9021 /* USB Configs */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_MX6 #define CONFIG_MXC_USB_PORT 1 #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h index e662e65204..0267705a78 100644 --- a/include/configs/tqma6.h +++ b/include/configs/tqma6.h @@ -81,7 +81,7 @@ #define CONFIG_SYS_FSL_ESDHC_ADDR 0 /* USB Configs */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_MX6 #define CONFIG_USB_HOST_ETHER #define CONFIG_USB_ETHER_SMSC95XX diff --git a/include/configs/trimslice.h b/include/configs/trimslice.h index 2c37107a3c..67ac2ea1bd 100644 --- a/include/configs/trimslice.h +++ b/include/configs/trimslice.h @@ -36,7 +36,7 @@ #define CONFIG_ENV_OFFSET (SZ_1M - CONFIG_ENV_SIZE) /* USB Host support */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_TEGRA /* USB networking support */ diff --git a/include/configs/usbarmory.h b/include/configs/usbarmory.h index 58b62d2448..70bb25da45 100644 --- a/include/configs/usbarmory.h +++ b/include/configs/usbarmory.h @@ -41,7 +41,7 @@ #define CONFIG_SYS_FSL_ESDHC_NUM 1 /* USB */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_MX5 #define CONFIG_MXC_USB_PORT 1 #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) diff --git a/include/configs/vct.h b/include/configs/vct.h index 9db6fee6e7..61b9488569 100644 --- a/include/configs/vct.h +++ b/include/configs/vct.h @@ -99,7 +99,7 @@ /* * USB/EHCI */ -#define CONFIG_USB_EHCI /* Enable EHCI USB support */ +#define CONFIG_USB_EHCI_HCD /* Enable EHCI USB support */ #define CONFIG_USB_EHCI_VCT /* on VCT platform */ #define CONFIG_EHCI_MMIO_BIG_ENDIAN #define CONFIG_EHCI_DESC_BIG_ENDIAN diff --git a/include/configs/venice2.h b/include/configs/venice2.h index 9e83863c0a..ec2f0a7117 100644 --- a/include/configs/venice2.h +++ b/include/configs/venice2.h @@ -34,7 +34,7 @@ #define CONFIG_SPI_FLASH_SIZE (4 << 20) /* USB Host support */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_TEGRA /* USB networking support */ diff --git a/include/configs/ventana.h b/include/configs/ventana.h index 0e851a1b10..5c27aa7490 100644 --- a/include/configs/ventana.h +++ b/include/configs/ventana.h @@ -27,7 +27,7 @@ #define CONFIG_SYS_MMC_ENV_PART 2 /* USB Host support */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_TEGRA /* USB networking support */ diff --git a/include/configs/vinco.h b/include/configs/vinco.h index c146f773db..4d6feb8a08 100644 --- a/include/configs/vinco.h +++ b/include/configs/vinco.h @@ -66,7 +66,7 @@ /* USB */ #ifdef CONFIG_CMD_USB -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #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 9a517a9738..01a4c55039 100644 --- a/include/configs/vining_2000.h +++ b/include/configs/vining_2000.h @@ -76,7 +76,7 @@ #define CONFIG_PHY_ATHEROS #ifdef CONFIG_CMD_USB -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_MX6 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_USB_HOST_ETHER diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h index 47daf724ab..7ce129e383 100644 --- a/include/configs/wandboard.h +++ b/include/configs/wandboard.h @@ -50,7 +50,7 @@ #define CONFIG_SYS_FSL_ESDHC_ADDR 0 /* USB Configs */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_MX6 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) diff --git a/include/configs/warp.h b/include/configs/warp.h index 5274b274a4..048ba036a3 100644 --- a/include/configs/warp.h +++ b/include/configs/warp.h @@ -58,7 +58,7 @@ /* USB Configs */ #ifdef CONFIG_CMD_USB -#define CONFIG_USB_EHCI +#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) diff --git a/include/configs/whistler.h b/include/configs/whistler.h index 429e5b6a32..6b605fd60c 100644 --- a/include/configs/whistler.h +++ b/include/configs/whistler.h @@ -36,7 +36,7 @@ #define CONFIG_SYS_MMC_ENV_PART 2 /* USB Host support */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_TEGRA /* USB networking support */ diff --git a/include/configs/x600.h b/include/configs/x600.h index 6e52e56222..bb47c93b66 100644 --- a/include/configs/x600.h +++ b/include/configs/x600.h @@ -100,7 +100,7 @@ #define CONFIG_FPGA_COUNT 1 /* USB EHCI options */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_SPEAR #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h index 653a30d3bd..f905890ae7 100644 --- a/include/configs/x86-common.h +++ b/include/configs/x86-common.h @@ -134,7 +134,7 @@ /*----------------------------------------------------------------------- * USB configuration */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_PCI #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 12 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 diff --git a/include/configs/xpedite550x.h b/include/configs/xpedite550x.h index 2793a9bfb9..264fb55e2e 100644 --- a/include/configs/xpedite550x.h +++ b/include/configs/xpedite550x.h @@ -332,7 +332,7 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy); /* * USB */ -#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_FSL #define CONFIG_EHCI_HCD_INIT_AFTER_RESET diff --git a/include/configs/xpress.h b/include/configs/xpress.h index e3ae4e8f74..239716edc3 100644 --- a/include/configs/xpress.h +++ b/include/configs/xpress.h @@ -64,7 +64,7 @@ #define CONFIG_MMCROOT "/dev/mmcblk0p2" /* USDHC2 */ /* USB Configs */ -#define CONFIG_USB_EHCI +#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) diff --git a/include/configs/zmx25.h b/include/configs/zmx25.h index c61c353901..05094a62d7 100644 --- a/include/configs/zmx25.h +++ b/include/configs/zmx25.h @@ -82,7 +82,7 @@ * USB */ #ifdef CONFIG_CMD_USB -#define CONFIG_USB_EHCI /* Enable EHCI USB support */ +#define CONFIG_USB_EHCI_HCD /* Enable EHCI USB support */ #define CONFIG_USB_EHCI_MXC #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_MXC_USB_PORT 1 |