diff options
| author | Tom Rini <trini@konsulko.com> | 2017-05-13 02:33:28 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-05-15 17:00:21 (GMT) |
| commit | 64d6ac5bc4a9bf8839e516959b35150ac8a0eb84 (patch) | |
| tree | 64d463e3c3fee97a9fdb34778cac85cea7f723cd /include | |
| parent | 8850c5d57c10aa6431d138d426e6e105c99cc7ba (diff) | |
| download | u-boot-64d6ac5bc4a9bf8839e516959b35150ac8a0eb84.tar.xz | |
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>
Diffstat (limited to 'include')
133 files changed, 0 insertions, 148 deletions
diff --git a/include/configs/B4860QDS.h b/include/configs/B4860QDS.h index 75d0a08..2041b7b 100644 --- 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 diff --git a/include/configs/BSC9131RDB.h b/include/configs/BSC9131RDB.h index e628a1a..72dc8ba 100644 --- 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 diff --git a/include/configs/BSC9132QDS.h b/include/configs/BSC9132QDS.h index af7fead..1b956fc 100644 --- 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 diff --git a/include/configs/M52277EVB.h b/include/configs/M52277EVB.h index 0ce78d5..3f7c1c9 100644 --- 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 diff --git a/include/configs/MPC8315ERDB.h b/include/configs/MPC8315ERDB.h index ab1e414..fbe033a 100644 --- 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 diff --git a/include/configs/MPC8349ITX.h b/include/configs/MPC8349ITX.h index 14494dc..6d35d70 100644 --- 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, diff --git a/include/configs/MPC837XEMDS.h b/include/configs/MPC837XEMDS.h index ff75544..fcced0e 100644 --- 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 diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h index 2307693..607b926 100644 --- 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 diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h index 219d359..8375ead 100644 --- 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 diff --git a/include/configs/MPC8544DS.h b/include/configs/MPC8544DS.h index 29f912e..b186e01 100644 --- 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 diff --git a/include/configs/MPC8572DS.h b/include/configs/MPC8572DS.h index 4b5ffc0..2c1be22 100644 --- 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 diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h index 126b662..867004f 100644 --- 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 diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h index 2378b19..0763cf3 100644 --- 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 diff --git a/include/configs/P1023RDB.h b/include/configs/P1023RDB.h index 1a00985..8821be3 100644 --- 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 diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h index 6a40af9..7629fe8 100644 --- 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 diff --git a/include/configs/T102xQDS.h b/include/configs/T102xQDS.h index 3cd636b..42e692c 100644 --- 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 diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h index 4dac070..c2175bd 100644 --- 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 diff --git a/include/configs/T1040QDS.h b/include/configs/T1040QDS.h index 018cb73..2565887 100644 --- 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 diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h index 2d80dea..d2ece40 100644 --- 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 diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h index affdd6b..02fd37d 100644 --- 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 */ diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h index c019a8f..faa1111 100644 --- 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 */ diff --git a/include/configs/T4240QDS.h b/include/configs/T4240QDS.h index 9ec1f82..5d030d1 100644 --- 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 diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h index 801215e..8ebfde1 100644 --- 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 diff --git a/include/configs/UCP1020.h b/include/configs/UCP1020.h index 77abee7..cd46db4 100644 --- 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 diff --git a/include/configs/advantech_dms-ba16.h b/include/configs/advantech_dms-ba16.h index 681fee1..2a39ae5 100644 --- 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 diff --git a/include/configs/alt.h b/include/configs/alt.h index 22fdf01..1652508 100644 --- 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 diff --git a/include/configs/apalis-tk1.h b/include/configs/apalis-tk1.h index ab24018..2c49729 100644 --- 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 */ diff --git a/include/configs/apalis_t30.h b/include/configs/apalis_t30.h index 75697e8..cdb50cc 100644 --- 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 */ diff --git a/include/configs/aristainetos-common.h b/include/configs/aristainetos-common.h index 42dc75a..3d51304 100644 --- 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 */ diff --git a/include/configs/beaver.h b/include/configs/beaver.h index 2503750..f3d7a2f 100644 --- 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 */ diff --git a/include/configs/cardhu.h b/include/configs/cardhu.h index 3240c37..f1b5a71 100644 --- 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 */ diff --git a/include/configs/cei-tk1-som.h b/include/configs/cei-tk1-som.h index 8a3714b..fd8df46 100644 --- 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 */ diff --git a/include/configs/cgtqmx6eval.h b/include/configs/cgtqmx6eval.h index 117672d..46c297e 100644 --- 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 diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h index e1ea0d7..425b149 100644 --- 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 diff --git a/include/configs/cm_t3517.h b/include/configs/cm_t3517.h index 55e543a..2417d16 100644 --- 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 diff --git a/include/configs/cm_t54.h b/include/configs/cm_t54.h index ba35c18..5c3bf69 100644 --- 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 diff --git a/include/configs/colibri_t20.h b/include/configs/colibri_t20.h index 5c9df55..03f6863 100644 --- 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 diff --git a/include/configs/colibri_t30.h b/include/configs/colibri_t30.h index 92caebc..853cd52 100644 --- 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 */ diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h index ee491b8..28383f4 100644 --- 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 diff --git a/include/configs/controlcenterd.h b/include/configs/controlcenterd.h index 9f8c4ad..7535ad5 100644 --- 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 diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h index 725d854..7e606cd 100644 --- 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 diff --git a/include/configs/corvus.h b/include/configs/corvus.h index 371547a..565f8a9 100644 --- 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 diff --git a/include/configs/cyrus.h b/include/configs/cyrus.h index a33550c..4359297 100644 --- 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 diff --git a/include/configs/dalmore.h b/include/configs/dalmore.h index 072af48..96a2df8 100644 --- 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 */ diff --git a/include/configs/ds414.h b/include/configs/ds414.h index c2ddaa0..d08c324 100644 --- 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 diff --git a/include/configs/duovero.h b/include/configs/duovero.h index a58c15c..e7fcc7e 100644 --- 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 diff --git a/include/configs/e2220-1170.h b/include/configs/e2220-1170.h index 98fe6c6..f880454 100644 --- 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 */ diff --git a/include/configs/eco5pk.h b/include/configs/eco5pk.h index 13fde39..c0953d7 100644 --- 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 diff --git a/include/configs/edminiv2.h b/include/configs/edminiv2.h index 1b17ccc..498a4d1 100644 --- 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 diff --git a/include/configs/embestmx6boards.h b/include/configs/embestmx6boards.h index 2de0eb3..6b53c00 100644 --- 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 diff --git a/include/configs/exynos5250-common.h b/include/configs/exynos5250-common.h index 9adce94..8e8cdf3 100644 --- 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 diff --git a/include/configs/ge_bx50v3.h b/include/configs/ge_bx50v3.h index f1eb63a..e1fc67e 100644 --- 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 diff --git a/include/configs/gose.h b/include/configs/gose.h index 2b0766e..8a1d6d3 100644 --- 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 diff --git a/include/configs/gplugd.h b/include/configs/gplugd.h index f2ce28f..f2260ea 100644 --- 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 */ diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h index 6ef0789..cff9fe8 100644 --- 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 diff --git a/include/configs/harmony.h b/include/configs/harmony.h index 8cd7cb5..c17d7fa 100644 --- 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 */ diff --git a/include/configs/jetson-tk1.h b/include/configs/jetson-tk1.h index 08d8272..89f6cbc 100644 --- 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 */ diff --git a/include/configs/koelsch.h b/include/configs/koelsch.h index 5f83861..2166e2c 100644 --- 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 diff --git a/include/configs/lager.h b/include/configs/lager.h index 6268bee..bf1352d 100644 --- 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 diff --git a/include/configs/liteboard.h b/include/configs/liteboard.h index 0b4ac4a..6a4d281 100644 --- 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 diff --git a/include/configs/ls1012aqds.h b/include/configs/ls1012aqds.h index a8e1843..2b3833d 100644 --- 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 diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h index d13517c..333bb26 100644 --- 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 diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h index 7f9357f..81f38a3 100644 --- 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 diff --git a/include/configs/lwmon5.h b/include/configs/lwmon5.h index a1779a7..6893bf2 100644 --- 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 diff --git a/include/configs/m53evk.h b/include/configs/m53evk.h index 395635b..c729e09 100644 --- 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 diff --git a/include/configs/ma5d4evk.h b/include/configs/ma5d4evk.h index cde3a66..bb85426 100644 --- 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 diff --git a/include/configs/mccmon6.h b/include/configs/mccmon6.h index 8c8ab7c..996b2d1 100644 --- 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 diff --git a/include/configs/medcom-wide.h b/include/configs/medcom-wide.h index b67c26b..d216582 100644 --- 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 */ diff --git a/include/configs/mpc5121ads.h b/include/configs/mpc5121ads.h index 9f6d10e..38c6df9 100644 --- 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 diff --git a/include/configs/mv-common.h b/include/configs/mv-common.h index 5146f9b..d000d76 100644 --- 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 */ diff --git a/include/configs/mx35pdk.h b/include/configs/mx35pdk.h index e49578e..e60b96f 100644 --- 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 diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h index d9fb665..54bc563 100644 --- 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 diff --git a/include/configs/mx53cx9020.h b/include/configs/mx53cx9020.h index c61ed89..151c4b3 100644 --- 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 diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h index 600b9d4..1b6d868 100644 --- 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 diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h index 5d8b6d8..87bec29 100644 --- 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) diff --git a/include/configs/mx6qarm2.h b/include/configs/mx6qarm2.h index 7e329d6..0a04244 100644 --- 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 diff --git a/include/configs/mx6qsabreauto.h b/include/configs/mx6qsabreauto.h index 44757c2..00b3bc8 100644 --- 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 diff --git a/include/configs/mx6sabresd.h b/include/configs/mx6sabresd.h index 702706d..1fd972f 100644 --- 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 diff --git a/include/configs/mx6slevk.h b/include/configs/mx6slevk.h index f45b8d0..c050782 100644 --- 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 diff --git a/include/configs/mx6sxsabreauto.h b/include/configs/mx6sxsabreauto.h index 33354c3..8809d80 100644 --- 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 diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h index 93a2bda..bdec09b 100644 --- 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 diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h index 86a7b97..98d9755 100644 --- 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) diff --git a/include/configs/mxs.h b/include/configs/mxs.h index 17e1bbc..46d5f14 100644 --- 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 diff --git a/include/configs/nas220.h b/include/configs/nas220.h index 84d706c..7004176 100644 --- 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 diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h index f450b71..de57b2e 100644 --- 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 diff --git a/include/configs/novena.h b/include/configs/novena.h index 590c121..b57ef30 100644 --- 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 diff --git a/include/configs/nyan-big.h b/include/configs/nyan-big.h index 249af99..b5357ea 100644 --- 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 */ diff --git a/include/configs/odroid.h b/include/configs/odroid.h index 899ca5e..afc7c5e 100644 --- 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 diff --git a/include/configs/odroid_xu3.h b/include/configs/odroid_xu3.h index 8469839..246fb80 100644 --- 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 */ diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h index 93aa17e..d27ceec 100644 --- 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 diff --git a/include/configs/omap3_overo.h b/include/configs/omap3_overo.h index 447ab47..050c3b1 100644 --- 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 diff --git a/include/configs/omap4_panda.h b/include/configs/omap4_panda.h index 967f2fa..51a3c8c 100644 --- 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 diff --git a/include/configs/omap5_uevm.h b/include/configs/omap5_uevm.h index 522df94..74d598a 100644 --- 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 diff --git a/include/configs/ot1200.h b/include/configs/ot1200.h index cfa6199..826bef1 100644 --- 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 diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index d3b3fb6..638e9da 100644 --- 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 diff --git a/include/configs/p1_twr.h b/include/configs/p1_twr.h index 1c05926..427629f 100644 --- 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 diff --git a/include/configs/p2371-0000.h b/include/configs/p2371-0000.h index b5ef933..b106439 100644 --- 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 */ diff --git a/include/configs/p2371-2180.h b/include/configs/p2371-2180.h index fb57a17..22fc122 100644 --- 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 */ diff --git a/include/configs/p2571.h b/include/configs/p2571.h index b496c61..974fd3f 100644 --- 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 */ diff --git a/include/configs/paz00.h b/include/configs/paz00.h index 1348504..87a8557 100644 --- 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 */ diff --git a/include/configs/pico-imx6ul.h b/include/configs/pico-imx6ul.h index d3fe63f..1ede6c9 100644 --- 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_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 0294026..c6d23a6 100644 --- 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_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 53a130a..a628971 100644 --- a/include/configs/platinum.h +++ b/include/configs/platinum.h @@ -52,7 +52,6 @@ #define CONFIG_PHYLIB /* USB config */ -#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 1db2e9b..ff396ec 100644 --- a/include/configs/plutux.h +++ b/include/configs/plutux.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 */ diff --git a/include/configs/porter.h b/include/configs/porter.h index 827c7b2..ac21411 100644 --- a/include/configs/porter.h +++ b/include/configs/porter.h @@ -82,7 +82,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 diff --git a/include/configs/sama5d2_ptc.h b/include/configs/sama5d2_ptc.h index 0112968..1a01ff7 100644 --- 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_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 9c11fe2..afc2c7d 100644 --- a/include/configs/seaboard.h +++ b/include/configs/seaboard.h @@ -37,7 +37,6 @@ #define CONFIG_SYS_MMC_ENV_PART 2 /* USB Host support */ -#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 cf62a95..c39bb24 100644 --- a/include/configs/sequoia.h +++ b/include/configs/sequoia.h @@ -192,9 +192,6 @@ /* USB */ #ifdef CONFIG_440EPX - -#undef CONFIG_USB_EHCI_HCD /* OHCI by default */ - #ifdef CONFIG_USB_EHCI_HCD #define CONFIG_USB_EHCI_PPC4XX #define CONFIG_SYS_PPC4XX_USB_ADDR 0xe0000300 diff --git a/include/configs/silk.h b/include/configs/silk.h index 38febae..84108fd 100644 --- a/include/configs/silk.h +++ b/include/configs/silk.h @@ -82,7 +82,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 diff --git a/include/configs/snapper9g45.h b/include/configs/snapper9g45.h index 56a6aad..ab9f8d6 100644 --- a/include/configs/snapper9g45.h +++ b/include/configs/snapper9g45.h @@ -61,7 +61,6 @@ #define CONFIG_TFTP_TSIZE /* USB */ -#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 ac63e53..16f3ce8 100644 --- a/include/configs/stout.h +++ b/include/configs/stout.h @@ -84,7 +84,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 diff --git a/include/configs/tao3530.h b/include/configs/tao3530.h index de44aa5..4f57ef1 100644 --- a/include/configs/tao3530.h +++ b/include/configs/tao3530.h @@ -228,7 +228,6 @@ */ /* 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 d297c27..f94eda8 100644 --- a/include/configs/tbs2910.h +++ b/include/configs/tbs2910.h @@ -93,7 +93,6 @@ /* USB */ #ifdef CONFIG_CMD_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 diff --git a/include/configs/tec-ng.h b/include/configs/tec-ng.h index decf8ba..6406d39 100644 --- a/include/configs/tec-ng.h +++ b/include/configs/tec-ng.h @@ -33,7 +33,6 @@ #define CONFIG_SPI_FLASH_SIZE (4 << 20) /* USB Host support */ -#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 e3add13..8ffdbec 100644 --- a/include/configs/tec.h +++ b/include/configs/tec.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 */ diff --git a/include/configs/tegra-common-post.h b/include/configs/tegra-common-post.h index 568236c..1a4a7e2 100644 --- a/include/configs/tegra-common-post.h +++ b/include/configs/tegra-common-post.h @@ -123,9 +123,6 @@ #endif /* remove USB */ -#ifdef CONFIG_USB_EHCI_HCD -#undef CONFIG_USB_EHCI_HCD -#endif #ifdef CONFIG_USB_EHCI_TEGRA #undef CONFIG_USB_EHCI_TEGRA #endif diff --git a/include/configs/titanium.h b/include/configs/titanium.h index 0dedffd..1b00db5 100644 --- 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_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 0267705..cf8ae9f 100644 --- 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_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 67ac2ea..ab9c5c3 100644 --- a/include/configs/trimslice.h +++ b/include/configs/trimslice.h @@ -36,7 +36,6 @@ #define CONFIG_ENV_OFFSET (SZ_1M - CONFIG_ENV_SIZE) /* USB Host support */ -#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 70bb25d..f725b79 100644 --- a/include/configs/usbarmory.h +++ b/include/configs/usbarmory.h @@ -41,7 +41,6 @@ #define CONFIG_SYS_FSL_ESDHC_NUM 1 /* USB */ -#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 61b9488..b1dccdf 100644 --- a/include/configs/vct.h +++ b/include/configs/vct.h @@ -99,7 +99,6 @@ /* * USB/EHCI */ -#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 ec2f0a7..850a9bd 100644 --- a/include/configs/venice2.h +++ b/include/configs/venice2.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 */ diff --git a/include/configs/ventana.h b/include/configs/ventana.h index 5c27aa7..1ab6476 100644 --- a/include/configs/ventana.h +++ b/include/configs/ventana.h @@ -27,7 +27,6 @@ #define CONFIG_SYS_MMC_ENV_PART 2 /* USB Host support */ -#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 4d6feb8..1651431 100644 --- a/include/configs/vinco.h +++ b/include/configs/vinco.h @@ -66,7 +66,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 #endif diff --git a/include/configs/vining_2000.h b/include/configs/vining_2000.h index 01a4c55..dda0113 100644 --- 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_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 7ce129e..6a96653 100644 --- 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_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 048ba03..ec95061 100644 --- a/include/configs/warp.h +++ b/include/configs/warp.h @@ -58,7 +58,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) diff --git a/include/configs/whistler.h b/include/configs/whistler.h index 6b605fd..9f350d5 100644 --- a/include/configs/whistler.h +++ b/include/configs/whistler.h @@ -36,7 +36,6 @@ #define CONFIG_SYS_MMC_ENV_PART 2 /* USB Host support */ -#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 bb47c93..bf6fafc 100644 --- a/include/configs/x600.h +++ b/include/configs/x600.h @@ -100,7 +100,6 @@ #define CONFIG_FPGA_COUNT 1 /* USB EHCI options */ -#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 f905890..29be55a 100644 --- a/include/configs/x86-common.h +++ b/include/configs/x86-common.h @@ -134,7 +134,6 @@ /*----------------------------------------------------------------------- * USB configuration */ -#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 264fb55..ad4247a 100644 --- a/include/configs/xpedite550x.h +++ b/include/configs/xpedite550x.h @@ -332,7 +332,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy); /* * USB */ -#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 239716e..efc364f 100644 --- 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_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 05094a6..c1daf65 100644 --- a/include/configs/zmx25.h +++ b/include/configs/zmx25.h @@ -82,7 +82,6 @@ * USB */ #ifdef CONFIG_CMD_USB -#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 |