usb: Move some CONFIGs to Kconfig

PATCH Superseded Masahiro Yamada 2 participants 6 messages Jun 3, 2016 – Jun 5, 2016

Subsystems (3)

USB Arm Samsung Exynos Arm/Zynq architecture

lore

Share & tools

lore

Masahiro Yamada

author

2016-06-03 22:35 UTC #0 lore raw

v3 cover usb: Move some CONFIGs to Kconfig

The patches in u-boot-usb are stale now,
so I regenerated new ones based on
commit 8b528709c5bba6a8d0ec83b20545bbd75f082704.

I tested it with buildman against all boards.

Masahiro Yamada (3):
configs: blackfin: move CONFIG_USB to defconfig
usb: move CONFIG_USB_XHCI to Kconfig with renaming
usb: move CONFIG_USB_XHCI_DWC3 to Kconfig

 common/usb.c                                     |  2 +-
 configs/am437x_hs_evm_defconfig                  |  2 ++
 configs/am43xx_evm_defconfig                     |  2 ++
 configs/am43xx_evm_ethboot_defconfig             |  2 ++
 configs/am43xx_evm_qspiboot_defconfig            |  2 ++
 configs/am43xx_evm_usbhost_boot_defconfig        |  2 ++
 configs/am57xx_evm_defconfig                     |  3 +++
 configs/am57xx_evm_nodt_defconfig                |  3 +++
 configs/am57xx_hs_evm_defconfig                  |  3 +++
 configs/bf526-ezbrd_defconfig                    |  1 +
 configs/bf527-ezkit-v2_defconfig                 |  1 +
 configs/bf527-ezkit_defconfig                    |  1 +
 configs/bf548-ezkit_defconfig                    |  1 +
 configs/cm_t43_defconfig                         |  3 +++
 configs/dra72_hs_evm_defconfig                   |  2 ++
 configs/dra74_hs_evm_defconfig                   |  2 ++
 configs/dra7xx_evm_defconfig                     |  2 ++
 configs/k2e_evm_defconfig                        |  3 +++
 configs/k2g_evm_defconfig                        |  3 +++
 configs/k2hk_evm_defconfig                       |  3 +++
 configs/k2l_evm_defconfig                        |  3 +++
 configs/ls1021aqds_ddr4_nor_defconfig            |  3 +++
 configs/ls1021aqds_ddr4_nor_lpuart_defconfig     |  3 +++
 configs/ls1021aqds_nand_defconfig                |  3 +++
 configs/ls1021aqds_nor_SECURE_BOOT_defconfig     |  3 +++
 configs/ls1021aqds_nor_defconfig                 |  3 +++
 configs/ls1021aqds_nor_lpuart_defconfig          |  3 +++
 configs/ls1021aqds_qspi_defconfig                |  3 +++
 configs/ls1021aqds_sdcard_ifc_defconfig          |  3 +++
 configs/ls1021aqds_sdcard_qspi_defconfig         |  3 +++
 configs/ls1021atwr_nor_SECURE_BOOT_defconfig     |  3 +++
 configs/ls1021atwr_nor_defconfig                 |  3 +++
 configs/ls1021atwr_nor_lpuart_defconfig          |  3 +++
 configs/ls1021atwr_qspi_defconfig                |  3 +++
 configs/ls1021atwr_sdcard_ifc_defconfig          |  3 +++
 configs/ls1021atwr_sdcard_qspi_defconfig         |  3 +++
 configs/ls1043aqds_defconfig                     |  3 +++
 configs/ls1043aqds_lpuart_defconfig              |  3 +++
 configs/ls1043aqds_nand_defconfig                |  3 +++
 configs/ls1043aqds_nor_ddr3_defconfig            |  3 +++
 configs/ls1043aqds_qspi_defconfig                |  3 +++
 configs/ls1043aqds_sdcard_ifc_defconfig          |  3 +++
 configs/ls1043aqds_sdcard_qspi_defconfig         |  3 +++
 configs/ls1043ardb_SECURE_BOOT_defconfig         |  3 +++
 configs/ls1043ardb_defconfig                     |  3 +++
 configs/ls1043ardb_nand_defconfig                |  3 +++
 configs/ls1043ardb_sdcard_defconfig              |  3 +++
 configs/ls2080aqds_SECURE_BOOT_defconfig         |  3 +++
 configs/ls2080aqds_defconfig                     |  3 +++
 configs/ls2080aqds_nand_defconfig                |  3 +++
 configs/ls2080ardb_SECURE_BOOT_defconfig         |  3 +++
 configs/ls2080ardb_defconfig                     |  3 +++
 configs/ls2080ardb_nand_defconfig                |  3 +++
 configs/odroid-xu3_defconfig                     |  2 ++
 configs/peach-pi_defconfig                       |  2 ++
 configs/peach-pit_defconfig                      |  2 ++
 configs/smdk5420_defconfig                       |  2 ++
 configs/xilinx_zynqmp_ep_defconfig               |  2 ++
 configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig |  2 ++
 configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig |  2 ++
 configs/xilinx_zynqmp_zcu102_defconfig           |  2 ++
 configs/xilinx_zynqmp_zcu102_revB_defconfig      |  2 ++
 drivers/usb/host/Kconfig                         | 12 ++++++------
 drivers/usb/host/Makefile                        |  2 +-
 include/configs/am43xx_evm.h                     |  2 --
 include/configs/am57xx_evm.h                     |  2 --
 include/configs/bf526-ezbrd.h                    |  1 -
 include/configs/bf527-ezkit.h                    |  1 -
 include/configs/bf548-ezkit.h                    |  1 -
 include/configs/cm_t43.h                         |  2 --
 include/configs/dra7xx_evm.h                     |  2 --
 include/configs/ds414.h                          |  3 +--
 include/configs/exynos5-common.h                 |  1 -
 include/configs/exynos5420-common.h              |  1 -
 include/configs/ls1021aqds.h                     |  2 --
 include/configs/ls1021atwr.h                     |  2 --
 include/configs/ls1043aqds.h                     |  2 --
 include/configs/ls1043ardb.h                     |  2 --
 include/configs/ls2080aqds.h                     |  2 --
 include/configs/ls2080ardb.h                     |  2 --
 include/configs/smdk5420.h                       |  1 -
 include/configs/ti_armv7_keystone2.h             |  2 --
 include/configs/xilinx_zynqmp.h                  |  2 --
 83 files changed, 167 insertions(+), 40 deletions(-)

Signature · 1 line

1.9.1

Masahiro Yamada

author

2016-06-03 22:35 UTC #1 lore raw

PATCH v3 1/3 configs: blackfin: move CONFIG_USB to defconfig

These Blackfin boards are the last ones that define CONFIG_USB in their headers.

Signed-off-by Masahiro Yamada <[email protected]>

---

Changes in v3:
- Re-generate based on commit 8b528709c5bba6a8d0ec83b20545bbd75f082704

Changes in v2:
- Newly added

 configs/bf526-ezbrd_defconfig    | 1 +
 configs/bf527-ezkit-v2_defconfig | 1 +
 configs/bf527-ezkit_defconfig    | 1 +
 configs/bf548-ezkit_defconfig    | 1 +
 include/configs/bf526-ezbrd.h    | 1 -
 include/configs/bf527-ezkit.h    | 1 -
 include/configs/bf548-ezkit.h    | 1 -
 7 files changed, 4 insertions(+), 3 deletions(-)

configs/bf526-ezbrd_defconfig +1 -0

index 85c2a6b..ea4f8e4 100644
@@ -17,3 +17,4 @@ CONFIG_CMD_FAT=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_SST=y
+CONFIG_USB=y

configs/bf527-ezkit-v2_defconfig +1 -0

index ff797f8..faac28d 100644
@@ -17,4 +17,5 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_USB=y
 CONFIG_LIB_RAND=y

configs/bf527-ezkit_defconfig +1 -0

index eff2a12..d69b146 100644
@@ -17,3 +17,4 @@ CONFIG_NET_RANDOM_ETHADDR=y
 # CONFIG_NET_TFTP_VARS is not set
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_USB=y

configs/bf548-ezkit_defconfig +1 -0

index 6d398ac..e4fa136 100644
@@ -16,5 +16,6 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_USB=y
 CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED=y
 CONFIG_LIB_RAND=y

include/configs/bf526-ezbrd.h +0 -1

index 74c3464..cf8ef8a 100644
@@ -125,7 +125,6 @@
  * USB Settings
  */
 #if !defined(__ADSPBF522__) && !defined(__ADSPBF523__)
-#define CONFIG_USB
 #define CONFIG_USB_MUSB_HCD
 #define CONFIG_USB_BLACKFIN
 #define CONFIG_USB_STORAGE

include/configs/bf527-ezkit.h +0 -1

index e268473..c958a94 100644
@@ -128,7 +128,6 @@
  * USB Settings
  */
 #if !defined(__ADSPBF522__) && !defined(__ADSPBF523__)
-#define CONFIG_USB
 #define CONFIG_USB_MUSB_HCD
 #define CONFIG_USB_BLACKFIN
 #define CONFIG_USB_STORAGE

include/configs/bf548-ezkit.h +0 -1

index 6830e4d..be28ea3 100644
@@ -151,7 +151,6 @@
  * USB Settings
  */
 #if !defined(__ADSPBF544__)
-#define CONFIG_USB
 #define CONFIG_USB_MUSB_HCD
 #define CONFIG_USB_BLACKFIN
 #define CONFIG_USB_STORAGE

Signature · 1 line

1.9.1

Masahiro Yamada

author

2016-06-03 22:35 UTC #2 lore raw

PATCH v3 2/3 usb: move CONFIG_USB_XHCI to Kconfig with renaming

In reply to Masahiro Yamada

Move CONFIG_USB_XHCI to defconfig files for all boards, renaming it into CONFIG_USB_XHCI_HCD.

As commented in the help of "config USB_XHCI" entry, this has been a TODO for a long time; now CONFIG_USB_XHCI_HCD and CONFIG_USB_XHCI have been unified in favor of the former.

Note:
Some boards define CONFIG_USB_XHCI in their headers without CONFIG_USB, which does not meet the "depends on" in Kconfig. I added CONFIG_USB=y for those boards when converting. Otherwise, they would fail to build.

Signed-off-by Masahiro Yamada <[email protected]>

---

Changes in v3:
- Re-generate based on commit 8b528709c5bba6a8d0ec83b20545bbd75f082704

Changes in v2:
- Newly added

 common/usb.c                                     | 2 +-
 configs/am437x_hs_evm_defconfig                  | 1 +
 configs/am43xx_evm_defconfig                     | 1 +
 configs/am43xx_evm_ethboot_defconfig             | 1 +
 configs/am43xx_evm_qspiboot_defconfig            | 1 +
 configs/am43xx_evm_usbhost_boot_defconfig        | 1 +
 configs/am57xx_evm_defconfig                     | 2 ++
 configs/am57xx_evm_nodt_defconfig                | 2 ++
 configs/am57xx_hs_evm_defconfig                  | 2 ++
 configs/cm_t43_defconfig                         | 2 ++
 configs/dra72_hs_evm_defconfig                   | 1 +
 configs/dra74_hs_evm_defconfig                   | 1 +
 configs/dra7xx_evm_defconfig                     | 1 +
 configs/k2e_evm_defconfig                        | 2 ++
 configs/k2g_evm_defconfig                        | 2 ++
 configs/k2hk_evm_defconfig                       | 2 ++
 configs/k2l_evm_defconfig                        | 2 ++
 configs/ls1021aqds_ddr4_nor_defconfig            | 2 ++
 configs/ls1021aqds_ddr4_nor_lpuart_defconfig     | 2 ++
 configs/ls1021aqds_nand_defconfig                | 2 ++
 configs/ls1021aqds_nor_SECURE_BOOT_defconfig     | 2 ++
 configs/ls1021aqds_nor_defconfig                 | 2 ++
 configs/ls1021aqds_nor_lpuart_defconfig          | 2 ++
 configs/ls1021aqds_qspi_defconfig                | 2 ++
 configs/ls1021aqds_sdcard_ifc_defconfig          | 2 ++
 configs/ls1021aqds_sdcard_qspi_defconfig         | 2 ++
 configs/ls1021atwr_nor_SECURE_BOOT_defconfig     | 2 ++
 configs/ls1021atwr_nor_defconfig                 | 2 ++
 configs/ls1021atwr_nor_lpuart_defconfig          | 2 ++
 configs/ls1021atwr_qspi_defconfig                | 2 ++
 configs/ls1021atwr_sdcard_ifc_defconfig          | 2 ++
 configs/ls1021atwr_sdcard_qspi_defconfig         | 2 ++
 configs/ls1043aqds_defconfig                     | 2 ++
 configs/ls1043aqds_lpuart_defconfig              | 2 ++
 configs/ls1043aqds_nand_defconfig                | 2 ++
 configs/ls1043aqds_nor_ddr3_defconfig            | 2 ++
 configs/ls1043aqds_qspi_defconfig                | 2 ++
 configs/ls1043aqds_sdcard_ifc_defconfig          | 2 ++
 configs/ls1043aqds_sdcard_qspi_defconfig         | 2 ++
 configs/ls1043ardb_SECURE_BOOT_defconfig         | 2 ++
 configs/ls1043ardb_defconfig                     | 2 ++
 configs/ls1043ardb_nand_defconfig                | 2 ++
 configs/ls1043ardb_sdcard_defconfig              | 2 ++
 configs/ls2080aqds_SECURE_BOOT_defconfig         | 2 ++
 configs/ls2080aqds_defconfig                     | 2 ++
 configs/ls2080aqds_nand_defconfig                | 2 ++
 configs/ls2080ardb_SECURE_BOOT_defconfig         | 2 ++
 configs/ls2080ardb_defconfig                     | 2 ++
 configs/ls2080ardb_nand_defconfig                | 2 ++
 configs/odroid-xu3_defconfig                     | 1 +
 configs/peach-pi_defconfig                       | 1 +
 configs/peach-pit_defconfig                      | 1 +
 configs/smdk5420_defconfig                       | 1 +
 configs/xilinx_zynqmp_ep_defconfig               | 1 +
 configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig | 1 +
 configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig | 1 +
 configs/xilinx_zynqmp_zcu102_defconfig           | 1 +
 configs/xilinx_zynqmp_zcu102_revB_defconfig      | 1 +
 drivers/usb/host/Kconfig                         | 6 ------
 drivers/usb/host/Makefile                        | 2 +-
 include/configs/am43xx_evm.h                     | 1 -
 include/configs/am57xx_evm.h                     | 1 -
 include/configs/cm_t43.h                         | 1 -
 include/configs/dra7xx_evm.h                     | 1 -
 include/configs/ds414.h                          | 3 +--
 include/configs/exynos5420-common.h              | 1 -
 include/configs/ls1021aqds.h                     | 1 -
 include/configs/ls1021atwr.h                     | 1 -
 include/configs/ls1043aqds.h                     | 1 -
 include/configs/ls1043ardb.h                     | 1 -
 include/configs/ls2080aqds.h                     | 1 -
 include/configs/ls2080ardb.h                     | 1 -
 include/configs/smdk5420.h                       | 1 -
 include/configs/ti_armv7_keystone2.h             | 1 -
 include/configs/xilinx_zynqmp.h                  | 1 -
 75 files changed, 100 insertions(+), 24 deletions(-)

common/usb.c +1 -1

index 8d9efe5..b3ba487 100644
@@ -1182,7 +1182,7 @@ int usb_new_device(struct usb_device *dev)
 	 * with the device. So a get_descriptor will fail before any
 	 * of that is done for XHCI unlike EHCI.
 	 */
-#ifdef CONFIG_USB_XHCI
+#ifdef CONFIG_USB_XHCI_HCD
 	do_read = false;
 #endif
 	err = usb_setup_device(dev, do_read, dev->parent);

configs/am437x_hs_evm_defconfig +1 -0

index c4accb6..a7d4041 100644
@@ -42,6 +42,7 @@ CONFIG_TI_QSPI=y
 CONFIG_TIMER=y
 CONFIG_OMAP_TIMER=y
 CONFIG_USB=y
+CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_DWC3_GADGET=y
 CONFIG_USB_DWC3_OMAP=y

configs/am43xx_evm_defconfig +1 -0

index 3955612..e8a3d75 100644
@@ -42,6 +42,7 @@ CONFIG_TI_QSPI=y
 CONFIG_TIMER=y
 CONFIG_OMAP_TIMER=y
 CONFIG_USB=y
+CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_DWC3_GADGET=y
 CONFIG_USB_DWC3_OMAP=y

configs/am43xx_evm_ethboot_defconfig +1 -0

index 33fb552..2a85a34 100644
@@ -29,6 +29,7 @@ CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_SYS_NS16550=y
 CONFIG_TI_QSPI=y
 CONFIG_USB=y
+CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_DWC3_GADGET=y
 CONFIG_USB_DWC3_OMAP=y

configs/am43xx_evm_qspiboot_defconfig +1 -0

index 5f90e2b..b4f1228 100644
@@ -29,6 +29,7 @@ CONFIG_SPI_FLASH_MACRONIX=y
 CONFIG_SYS_NS16550=y
 CONFIG_TI_QSPI=y
 CONFIG_USB=y
+CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_DWC3_GADGET=y
 CONFIG_USB_DWC3_OMAP=y

configs/am43xx_evm_usbhost_boot_defconfig +1 -0

index 72f4ad8..e88a9e3 100644
@@ -40,6 +40,7 @@ CONFIG_TI_QSPI=y
 CONFIG_TIMER=y
 CONFIG_OMAP_TIMER=y
 CONFIG_USB=y
+CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_DWC3_GADGET=y
 CONFIG_USB_DWC3_OMAP=y

configs/am57xx_evm_defconfig +2 -0

index cccdc10..815811f 100644
@@ -33,3 +33,5 @@ CONFIG_DM_MMC=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
 CONFIG_SYS_NS16550=y
+CONFIG_USB=y
+CONFIG_USB_XHCI_HCD=y

configs/am57xx_evm_nodt_defconfig +2 -0

index 47d103b..373aa9e 100644
@@ -22,4 +22,6 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_SYS_NS16550=y
+CONFIG_USB=y
+CONFIG_USB_XHCI_HCD=y
 CONFIG_OF_LIBFDT=y

configs/am57xx_hs_evm_defconfig +2 -0

index 60525cd..aa3d627 100644
@@ -34,3 +34,5 @@ CONFIG_DM_MMC=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
 CONFIG_SYS_NS16550=y
+CONFIG_USB=y
+CONFIG_USB_XHCI_HCD=y

configs/cm_t43_defconfig +2 -0

index c926a3a..a8ffea7 100644
@@ -37,4 +37,6 @@ CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_SPI_FLASH_SST=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_SYS_NS16550=y
+CONFIG_USB=y
+CONFIG_USB_XHCI_HCD=y
 CONFIG_OF_LIBFDT=y

configs/dra72_hs_evm_defconfig +1 -0

index 01f985e..767e067 100644
@@ -44,6 +44,7 @@ CONFIG_TI_QSPI=y
 CONFIG_TIMER=y
 CONFIG_OMAP_TIMER=y
 CONFIG_USB=y
+CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_DWC3_GADGET=y
 CONFIG_USB_DWC3_OMAP=y

configs/dra74_hs_evm_defconfig +1 -0

index 1b30ad4..e05efe0 100644
@@ -43,6 +43,7 @@ CONFIG_TI_QSPI=y
 CONFIG_TIMER=y
 CONFIG_OMAP_TIMER=y
 CONFIG_USB=y
+CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_DWC3_GADGET=y
 CONFIG_USB_DWC3_OMAP=y

configs/dra7xx_evm_defconfig +1 -0

index 288f8b3..9ee579c 100644
@@ -42,6 +42,7 @@ CONFIG_TI_QSPI=y
 CONFIG_TIMER=y
 CONFIG_OMAP_TIMER=y
 CONFIG_USB=y
+CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_DWC3_GADGET=y
 CONFIG_USB_DWC3_OMAP=y

configs/k2e_evm_defconfig +2 -0

index 044a9bf..b1d4018 100644
@@ -32,3 +32,5 @@ CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_DM_ETH=y
 CONFIG_SYS_NS16550=y
+CONFIG_USB=y
+CONFIG_USB_XHCI_HCD=y

configs/k2g_evm_defconfig +2 -0

index d0b45ce..2c7167e 100644
@@ -32,3 +32,5 @@ CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_DM_ETH=y
 CONFIG_REMOTEPROC_TI_POWER=y
 CONFIG_SYS_NS16550=y
+CONFIG_USB=y
+CONFIG_USB_XHCI_HCD=y

configs/k2hk_evm_defconfig +2 -0

index 3975e80..410de64 100644
@@ -32,3 +32,5 @@ CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_DM_ETH=y
 CONFIG_SYS_NS16550=y
+CONFIG_USB=y
+CONFIG_USB_XHCI_HCD=y

configs/k2l_evm_defconfig +2 -0

index 844dd57..91d7a04 100644
@@ -32,3 +32,5 @@ CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_STMICRO=y
 CONFIG_DM_ETH=y
 CONFIG_SYS_NS16550=y
+CONFIG_USB=y
+CONFIG_USB_XHCI_HCD=y

configs/ls1021aqds_ddr4_nor_defconfig +2 -0

index 04ded54..92f7796 100644
@@ -27,3 +27,5 @@ CONFIG_DM=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
 CONFIG_SYS_NS16550=y
+CONFIG_USB=y
+CONFIG_USB_XHCI_HCD=y

configs/ls1021aqds_ddr4_nor_lpuart_defconfig +2 -0

index 7915200..338dbf4 100644
@@ -27,3 +27,5 @@ CONFIG_DM=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
 CONFIG_FSL_LPUART=y
+CONFIG_USB=y
+CONFIG_USB_XHCI_HCD=y

configs/ls1021aqds_nand_defconfig +2 -0

index 9002a01..b3edd0a 100644
@@ -21,6 +21,8 @@ CONFIG_CMD_FAT=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
 CONFIG_SYS_NS16550=y
+CONFIG_USB=y
+CONFIG_USB_XHCI_HCD=y
 CONFIG_OF_LIBFDT=y
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y

configs/ls1021aqds_nor_SECURE_BOOT_defconfig +2 -0

index 30c2ca5..499fece 100644
@@ -22,6 +22,8 @@ CONFIG_DM=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
 CONFIG_SYS_NS16550=y
+CONFIG_USB=y
+CONFIG_USB_XHCI_HCD=y
 CONFIG_RSA=y
 CONFIG_OF_LIBFDT=y
 CONFIG_FIT=y

configs/ls1021aqds_nor_defconfig +2 -0

index a30153a..cf4f79d 100644
@@ -26,3 +26,5 @@ CONFIG_DM=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
 CONFIG_SYS_NS16550=y
+CONFIG_USB=y
+CONFIG_USB_XHCI_HCD=y

configs/ls1021aqds_nor_lpuart_defconfig +2 -0

index 217cf88..5ad9082 100644
@@ -27,3 +27,5 @@ CONFIG_DM=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
 CONFIG_FSL_LPUART=y
+CONFIG_USB=y
+CONFIG_USB_XHCI_HCD=y

configs/ls1021aqds_qspi_defconfig +2 -0

index 15b0b0d..33484ed 100644
@@ -33,3 +33,5 @@ CONFIG_E1000=y
 CONFIG_SYS_NS16550=y
 CONFIG_FSL_DSPI=y
 CONFIG_FSL_QSPI=y
+CONFIG_USB=y
+CONFIG_USB_XHCI_HCD=y

configs/ls1021aqds_sdcard_ifc_defconfig +2 -0

index ef42d3d..0992718 100644
@@ -25,3 +25,5 @@ CONFIG_DM=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
 CONFIG_SYS_NS16550=y
+CONFIG_USB=y
+CONFIG_USB_XHCI_HCD=y

configs/ls1021aqds_sdcard_qspi_defconfig +2 -0

index 69f5b61..abb3287 100644
@@ -32,3 +32,5 @@ CONFIG_E1000=y
 CONFIG_SYS_NS16550=y
 CONFIG_FSL_DSPI=y
 CONFIG_FSL_QSPI=y
+CONFIG_USB=y
+CONFIG_USB_XHCI_HCD=y

configs/ls1021atwr_nor_SECURE_BOOT_defconfig +2 -0

index 1c0ae06..f3a9e35 100644
@@ -22,6 +22,8 @@ CONFIG_DM=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
 CONFIG_SYS_NS16550=y
+CONFIG_USB=y
+CONFIG_USB_XHCI_HCD=y
 CONFIG_RSA=y
 CONFIG_OF_LIBFDT=y
 CONFIG_FIT=y

configs/ls1021atwr_nor_defconfig +2 -0

index 10cc576..be68631 100644
@@ -26,3 +26,5 @@ CONFIG_DM=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
 CONFIG_SYS_NS16550=y
+CONFIG_USB=y
+CONFIG_USB_XHCI_HCD=y

configs/ls1021atwr_nor_lpuart_defconfig +2 -0

index f56f931..ec165b1 100644
@@ -27,3 +27,5 @@ CONFIG_DM=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
 CONFIG_FSL_LPUART=y
+CONFIG_USB=y
+CONFIG_USB_XHCI_HCD=y

configs/ls1021atwr_qspi_defconfig +2 -0

index bc419fb..c0a7967 100644
@@ -34,3 +34,5 @@ CONFIG_E1000=y
 CONFIG_SYS_NS16550=y
 CONFIG_FSL_DSPI=y
 CONFIG_FSL_QSPI=y
+CONFIG_USB=y
+CONFIG_USB_XHCI_HCD=y

configs/ls1021atwr_sdcard_ifc_defconfig +2 -0

index e27758b..1900c1a 100644
@@ -20,6 +20,8 @@ CONFIG_CMD_FAT=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
 CONFIG_SYS_NS16550=y
+CONFIG_USB=y
+CONFIG_USB_XHCI_HCD=y
 CONFIG_OF_LIBFDT=y
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y

configs/ls1021atwr_sdcard_qspi_defconfig +2 -0

index 01856d4..272dabd 100644
@@ -34,3 +34,5 @@ CONFIG_E1000=y
 CONFIG_SYS_NS16550=y
 CONFIG_FSL_DSPI=y
 CONFIG_FSL_QSPI=y
+CONFIG_USB=y
+CONFIG_USB_XHCI_HCD=y

configs/ls1043aqds_defconfig +2 -0

index 346faf4..fa4270a 100644
@@ -25,3 +25,5 @@ CONFIG_OF_CONTROL=y
 CONFIG_DM=y
 CONFIG_SPI_FLASH=y
 CONFIG_SYS_NS16550=y
+CONFIG_USB=y
+CONFIG_USB_XHCI_HCD=y

configs/ls1043aqds_lpuart_defconfig +2 -0

index 2c6ac35..2a845b6 100644
@@ -26,3 +26,5 @@ CONFIG_OF_CONTROL=y
 CONFIG_DM=y
 CONFIG_SPI_FLASH=y
 CONFIG_FSL_LPUART=y
+CONFIG_USB=y
+CONFIG_USB_XHCI_HCD=y

configs/ls1043aqds_nand_defconfig +2 -0

index cc8d8fa..20dc98b 100644
@@ -26,3 +26,5 @@ CONFIG_OF_CONTROL=y
 CONFIG_DM=y
 CONFIG_SPI_FLASH=y
 CONFIG_SYS_NS16550=y
+CONFIG_USB=y
+CONFIG_USB_XHCI_HCD=y

configs/ls1043aqds_nor_ddr3_defconfig +2 -0

index 7d0646c..829ed32 100644
@@ -24,3 +24,5 @@ CONFIG_OF_CONTROL=y
 CONFIG_DM=y
 CONFIG_SPI_FLASH=y
 CONFIG_SYS_NS16550=y
+CONFIG_USB=y
+CONFIG_USB_XHCI_HCD=y

configs/ls1043aqds_qspi_defconfig +2 -0

index 8ea1416..b6b98e3 100644
@@ -26,3 +26,5 @@ CONFIG_OF_CONTROL=y
 CONFIG_DM=y
 CONFIG_SPI_FLASH=y
 CONFIG_SYS_NS16550=y
+CONFIG_USB=y
+CONFIG_USB_XHCI_HCD=y

configs/ls1043aqds_sdcard_ifc_defconfig +2 -0

index 7e5949d..40ae837 100644
@@ -26,3 +26,5 @@ CONFIG_OF_CONTROL=y
 CONFIG_DM=y
 CONFIG_SPI_FLASH=y
 CONFIG_SYS_NS16550=y
+CONFIG_USB=y
+CONFIG_USB_XHCI_HCD=y

configs/ls1043aqds_sdcard_qspi_defconfig +2 -0

index 609fd63..8228d22 100644
@@ -27,3 +27,5 @@ CONFIG_OF_CONTROL=y
 CONFIG_DM=y
 CONFIG_SPI_FLASH=y
 CONFIG_SYS_NS16550=y
+CONFIG_USB=y
+CONFIG_USB_XHCI_HCD=y

configs/ls1043ardb_SECURE_BOOT_defconfig +2 -0

index cacee2f..9e4ab65 100644
@@ -21,4 +21,6 @@ CONFIG_OF_CONTROL=y
 CONFIG_DM=y
 CONFIG_SPI_FLASH=y
 CONFIG_SYS_NS16550=y
+CONFIG_USB=y
+CONFIG_USB_XHCI_HCD=y
 CONFIG_RSA=y

configs/ls1043ardb_defconfig +2 -0

index 49d0740..37a67b9 100644
@@ -21,3 +21,5 @@ CONFIG_OF_CONTROL=y
 CONFIG_DM=y
 CONFIG_SPI_FLASH=y
 CONFIG_SYS_NS16550=y
+CONFIG_USB=y
+CONFIG_USB_XHCI_HCD=y

configs/ls1043ardb_nand_defconfig +2 -0

index d240cde..e847312 100644
@@ -22,3 +22,5 @@ CONFIG_OF_CONTROL=y
 CONFIG_DM=y
 CONFIG_SPI_FLASH=y
 CONFIG_SYS_NS16550=y
+CONFIG_USB=y
+CONFIG_USB_XHCI_HCD=y

configs/ls1043ardb_sdcard_defconfig +2 -0

index f853685..e8a516b 100644
@@ -22,3 +22,5 @@ CONFIG_OF_CONTROL=y
 CONFIG_DM=y
 CONFIG_SPI_FLASH=y
 CONFIG_SYS_NS16550=y
+CONFIG_USB=y
+CONFIG_USB_XHCI_HCD=y

configs/ls2080aqds_SECURE_BOOT_defconfig +2 -0

index 04a84ab..14619fb 100644
@@ -29,5 +29,7 @@ CONFIG_NETDEVICES=y
 CONFIG_E1000=y
 CONFIG_SYS_NS16550=y
 CONFIG_FSL_DSPI=y
+CONFIG_USB=y
+CONFIG_USB_XHCI_HCD=y
 CONFIG_RSA=y
 CONFIG_EFI_LOADER_BOUNCE_BUFFER=y

configs/ls2080aqds_defconfig +2 -0

index 3b6504b..2ca0117 100644
@@ -29,4 +29,6 @@ CONFIG_NETDEVICES=y
 CONFIG_E1000=y
 CONFIG_SYS_NS16550=y
 CONFIG_FSL_DSPI=y
+CONFIG_USB=y
+CONFIG_USB_XHCI_HCD=y
 CONFIG_EFI_LOADER_BOUNCE_BUFFER=y

configs/ls2080aqds_nand_defconfig +2 -0

index 1302313..2af3687 100644
@@ -22,5 +22,7 @@ CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
 CONFIG_SYS_NS16550=y
+CONFIG_USB=y
+CONFIG_USB_XHCI_HCD=y
 CONFIG_OF_LIBFDT=y
 CONFIG_EFI_LOADER_BOUNCE_BUFFER=y

configs/ls2080ardb_SECURE_BOOT_defconfig +2 -0

index f974d88..76a9c3d 100644
@@ -29,5 +29,7 @@ CONFIG_NETDEVICES=y
 CONFIG_E1000=y
 CONFIG_SYS_NS16550=y
 CONFIG_FSL_DSPI=y
+CONFIG_USB=y
+CONFIG_USB_XHCI_HCD=y
 CONFIG_RSA=y
 CONFIG_EFI_LOADER_BOUNCE_BUFFER=y

configs/ls2080ardb_defconfig +2 -0

index 0168dbb..82d14be 100644
@@ -29,4 +29,6 @@ CONFIG_NETDEVICES=y
 CONFIG_E1000=y
 CONFIG_SYS_NS16550=y
 CONFIG_FSL_DSPI=y
+CONFIG_USB=y
+CONFIG_USB_XHCI_HCD=y
 CONFIG_EFI_LOADER_BOUNCE_BUFFER=y

configs/ls2080ardb_nand_defconfig +2 -0

index 718a651..17f0f6d 100644
@@ -22,5 +22,7 @@ CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_NETDEVICES=y
 CONFIG_E1000=y
 CONFIG_SYS_NS16550=y
+CONFIG_USB=y
+CONFIG_USB_XHCI_HCD=y
 CONFIG_OF_LIBFDT=y
 CONFIG_EFI_LOADER_BOUNCE_BUFFER=y

configs/odroid-xu3_defconfig +1 -0

index 8995cc2..e78f973 100644
@@ -36,6 +36,7 @@ CONFIG_PMIC_S2MPS11=y
 CONFIG_DM_REGULATOR=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
+CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_DWC3_GADGET=y
 CONFIG_USB_DWC3_PHY_SAMSUNG=y

configs/peach-pi_defconfig +1 -0

index c8c74c0..9a815d0 100644
@@ -55,6 +55,7 @@ CONFIG_EXYNOS_SPI=y
 CONFIG_TPM_TIS_INFINEON=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
+CONFIG_USB_XHCI_HCD=y
 CONFIG_VIDEO_BRIDGE=y
 CONFIG_VIDEO_BRIDGE_PARADE_PS862X=y
 CONFIG_TPM=y

configs/peach-pit_defconfig +1 -0

index c5fbf8c..5bea937 100644
@@ -55,6 +55,7 @@ CONFIG_EXYNOS_SPI=y
 CONFIG_TPM_TIS_INFINEON=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
+CONFIG_USB_XHCI_HCD=y
 CONFIG_VIDEO_BRIDGE=y
 CONFIG_VIDEO_BRIDGE_PARADE_PS862X=y
 CONFIG_TPM=y

configs/smdk5420_defconfig +1 -0

index 40de7c1..ad599fc 100644
@@ -36,4 +36,5 @@ CONFIG_DM_REGULATOR=y
 CONFIG_EXYNOS_SPI=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
+CONFIG_USB_XHCI_HCD=y
 CONFIG_VIDEO_BRIDGE=y

configs/xilinx_zynqmp_ep_defconfig +1 -0

index f342ed2..2a5b2d9 100644
@@ -56,6 +56,7 @@ CONFIG_DEBUG_UART_BASE=0xff000000
 CONFIG_DEBUG_UART_CLOCK=25000000
 CONFIG_DEBUG_UART_ANNOUNCE=y
 CONFIG_USB=y
+CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_DWC3_GADGET=y
 CONFIG_USB_GADGET=y

configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig +1 -0

index 5d641a5..457393a 100644
@@ -49,6 +49,7 @@ CONFIG_DEBUG_UART_BASE=0xff000000
 CONFIG_DEBUG_UART_CLOCK=100000000
 CONFIG_DEBUG_UART_ANNOUNCE=y
 CONFIG_USB=y
+CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_DWC3_GADGET=y
 CONFIG_USB_ULPI_VIEWPORT=y

configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig +1 -0

index 77e6180..fe415cd 100644
@@ -41,6 +41,7 @@ CONFIG_SPI_FLASH_SST=y
 CONFIG_DM_ETH=y
 CONFIG_ZYNQ_GEM=y
 CONFIG_USB=y
+CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_DWC3_GADGET=y
 CONFIG_USB_ULPI_VIEWPORT=y

configs/xilinx_zynqmp_zcu102_defconfig +1 -0

index b370bc1..6b76dbc 100644
@@ -47,6 +47,7 @@ CONFIG_DEBUG_UART_BASE=0xff000000
 CONFIG_DEBUG_UART_CLOCK=100000000
 CONFIG_DEBUG_UART_ANNOUNCE=y
 CONFIG_USB=y
+CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_DWC3_GADGET=y
 CONFIG_USB_ULPI_VIEWPORT=y

configs/xilinx_zynqmp_zcu102_revB_defconfig +1 -0

index 9764452..1a3fb21 100644
@@ -47,6 +47,7 @@ CONFIG_DEBUG_UART_BASE=0xff000000
 CONFIG_DEBUG_UART_CLOCK=100000000
 CONFIG_DEBUG_UART_ANNOUNCE=y
 CONFIG_USB=y
+CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_DWC3_GADGET=y
 CONFIG_USB_ULPI_VIEWPORT=y

drivers/usb/host/Kconfig +0 -6

index d2363c8..8a6f732 100644
@@ -9,12 +9,6 @@ config USB_XHCI_HCD
 	  The eXtensible Host Controller Interface (xHCI) is standard for USB 3.0
 	  "SuperSpeed" host controller hardware.
 
-config USB_XHCI
-	bool
-	default USB_XHCI_HCD
-	---help---
-	  TODO: rename after most boards switch to Kconfig
-
 if USB_XHCI_HCD
 
 config USB_XHCI_UNIPHIER

drivers/usb/host/Makefile +1 -1

index 507519e..620d114 100644
@@ -54,7 +54,7 @@ obj-$(CONFIG_USB_EHCI_RMOBILE) += ehci-rmobile.o
 obj-$(CONFIG_USB_EHCI_ZYNQ) += ehci-zynq.o
 
 # xhci
-obj-$(CONFIG_USB_XHCI) += xhci.o xhci-mem.o xhci-ring.o
+obj-$(CONFIG_USB_XHCI_HCD) += xhci.o xhci-mem.o xhci-ring.o
 obj-$(CONFIG_USB_XHCI_DWC3) += xhci-dwc3.o
 obj-$(CONFIG_USB_XHCI_ZYNQMP) += xhci-zynqmp.o
 obj-$(CONFIG_USB_XHCI_KEYSTONE) += xhci-keystone.o

include/configs/am43xx_evm.h +0 -1

index a54303d..170d069 100644
@@ -99,7 +99,6 @@
 #if defined(CONFIG_SPL_USB_HOST_SUPPORT) || !defined(CONFIG_SPL_BUILD)
 #define CONFIG_SYS_USB_FAT_BOOT_PARTITION		1
 #define CONFIG_USB_HOST
-#define CONFIG_USB_XHCI
 #define CONFIG_USB_XHCI_DWC3
 #define CONFIG_USB_XHCI_OMAP
 #define CONFIG_USB_STORAGE

include/configs/am57xx_evm.h +0 -1

index d53b0fd..6a3d8e5 100644
@@ -65,7 +65,6 @@
 /* USB xHCI HOST */
 #define CONFIG_USB_HOST
 #define CONFIG_USB_XHCI_DWC3
-#define CONFIG_USB_XHCI
 #define CONFIG_USB_XHCI_OMAP
 #define CONFIG_USB_STORAGE
 #define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS 2

include/configs/cm_t43.h +0 -1

index c2dbd31..51eac93 100644
@@ -61,7 +61,6 @@
 
 /* USB support */
 #define CONFIG_USB_HOST
-#define CONFIG_USB_XHCI
 #define CONFIG_USB_XHCI_OMAP
 #define CONFIG_USB_XHCI_DWC3
 #define CONFIG_USB_STORAGE

include/configs/dra7xx_evm.h +0 -1

index 8a0cd66..0571dc0 100644
@@ -211,7 +211,6 @@
 
 /* USB xHCI HOST */
 #define CONFIG_USB_HOST
-#define CONFIG_USB_XHCI
 #define CONFIG_USB_XHCI_DWC3
 #define CONFIG_USB_XHCI_OMAP
 #define CONFIG_USB_STORAGE

include/configs/ds414.h +1 -2

index 64c546c..23373cd 100644
@@ -71,12 +71,11 @@
  * - USB init fails, controller does not respond in time */
 #if 0
 #undef CONFIG_DM_USB
-#define CONFIG_USB_XHCI
 #define CONFIG_USB_XHCI_PCI
 #define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS 2
 #endif
 
-#if !defined(CONFIG_USB_XHCI)
+#if !defined(CONFIG_USB_XHCI_HCD)
 #define CONFIG_USB_EHCI
 #define CONFIG_USB_EHCI_MARVELL
 #define CONFIG_EHCI_IS_TDI

include/configs/exynos5420-common.h +0 -1

index cd86e06..16153eb 100644
@@ -48,7 +48,6 @@
  */
 #define CONFIG_CORE_COUNT		0x8
 
-#define CONFIG_USB_XHCI
 #define CONFIG_USB_XHCI_EXYNOS
 
 #endif	/* __CONFIG_EXYNOS5420_H */

include/configs/ls1021aqds.h +0 -1

index f605ca6..ac32240 100644
@@ -451,7 +451,6 @@ unsigned long get_board_ddr_clk(void);
 #ifdef CONFIG_HAS_FSL_XHCI_USB
 #define CONFIG_USB_XHCI_FSL
 #define CONFIG_USB_XHCI_DWC3
-#define CONFIG_USB_XHCI
 #define CONFIG_USB_MAX_CONTROLLER_COUNT		1
 #define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS	2
 #endif

include/configs/ls1021atwr.h +0 -1

index 32d2acc..c38d680 100644
@@ -58,7 +58,6 @@
 #ifdef CONFIG_HAS_FSL_XHCI_USB
 #define CONFIG_USB_XHCI_FSL
 #define CONFIG_USB_XHCI_DWC3
-#define CONFIG_USB_XHCI
 #define CONFIG_USB_MAX_CONTROLLER_COUNT        1
 #define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS     2
 #endif

include/configs/ls1043aqds.h +0 -1

index af1f73d..103bb2e 100644
@@ -388,7 +388,6 @@ unsigned long get_board_ddr_clk(void);
 /* USB */
 #define CONFIG_HAS_FSL_XHCI_USB
 #ifdef CONFIG_HAS_FSL_XHCI_USB
-#define CONFIG_USB_XHCI
 #define CONFIG_USB_XHCI_FSL
 #define CONFIG_USB_XHCI_DWC3
 #define CONFIG_USB_MAX_CONTROLLER_COUNT		3

include/configs/ls1043ardb.h +0 -1

index aca8d95..0a71637 100644
@@ -278,7 +278,6 @@
 /* USB */
 #define CONFIG_HAS_FSL_XHCI_USB
 #ifdef CONFIG_HAS_FSL_XHCI_USB
-#define CONFIG_USB_XHCI
 #define CONFIG_USB_XHCI_FSL
 #define CONFIG_USB_XHCI_DWC3
 #define CONFIG_USB_MAX_CONTROLLER_COUNT		3

include/configs/ls2080aqds.h +0 -1

index 4b27114..743473f 100644
@@ -383,7 +383,6 @@ unsigned long get_board_ddr_clk(void);
  * USB
  */
 #define CONFIG_HAS_FSL_XHCI_USB
-#define CONFIG_USB_XHCI
 #define CONFIG_USB_XHCI_FSL
 #define CONFIG_USB_XHCI_DWC3
 #define CONFIG_USB_MAX_CONTROLLER_COUNT		2

include/configs/ls2080ardb.h +0 -1

index 3baca64..1fe4138 100644
@@ -316,7 +316,6 @@ unsigned long get_board_sys_clk(void);
  * USB
  */
 #define CONFIG_HAS_FSL_XHCI_USB
-#define CONFIG_USB_XHCI
 #define CONFIG_USB_XHCI_FSL
 #define CONFIG_USB_XHCI_DWC3
 #define CONFIG_USB_MAX_CONTROLLER_COUNT         2

include/configs/smdk5420.h +0 -1

index 9cf886c..c15acec 100644
@@ -31,7 +31,6 @@
 #define CONFIG_DEFAULT_CONSOLE		"console=ttySAC1,115200n8\0"
 
 /* USB */
-#define CONFIG_USB_XHCI
 #define CONFIG_USB_XHCI_EXYNOS
 
 /* DRAM Memory Banks */

include/configs/ti_armv7_keystone2.h +0 -1

index 2c9028c..2292eb2 100644
@@ -191,7 +191,6 @@
 					"-(ubifs)"
 
 /* USB Configuration */
-#define CONFIG_USB_XHCI
 #define CONFIG_USB_XHCI_DWC3
 #define CONFIG_USB_XHCI_KEYSTONE
 #define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS	2

include/configs/xilinx_zynqmp.h +0 -1

index ffb6b34..b0e0c22 100644
@@ -118,7 +118,6 @@
 
 #if defined(CONFIG_ZYNQMP_USB)
 #define CONFIG_USB_XHCI_DWC3
-#define CONFIG_USB_XHCI
 #define CONFIG_USB_MAX_CONTROLLER_COUNT         1
 #define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS      2
 #define CONFIG_USB_STORAGE

Signature · 1 line

1.9.1

Masahiro Yamada

author

2016-06-03 22:35 UTC #3 lore raw

PATCH v3 3/3 usb: move CONFIG_USB_XHCI_DWC3 to Kconfig

In reply to Masahiro Yamada

Create an entry for "config USB_XHCI_DWC3" in Kconfig and switch over to it for all boards.

Signed-off-by Masahiro Yamada <[email protected]>

---

Changes in v3:
- Re-generate based on commit 8b528709c5bba6a8d0ec83b20545bbd75f082704

Changes in v2:
- Newly added

 configs/am437x_hs_evm_defconfig                  | 1 +
 configs/am43xx_evm_defconfig                     | 1 +
 configs/am43xx_evm_ethboot_defconfig             | 1 +
 configs/am43xx_evm_qspiboot_defconfig            | 1 +
 configs/am43xx_evm_usbhost_boot_defconfig        | 1 +
 configs/am57xx_evm_defconfig                     | 1 +
 configs/am57xx_evm_nodt_defconfig                | 1 +
 configs/am57xx_hs_evm_defconfig                  | 1 +
 configs/cm_t43_defconfig                         | 1 +
 configs/dra72_hs_evm_defconfig                   | 1 +
 configs/dra74_hs_evm_defconfig                   | 1 +
 configs/dra7xx_evm_defconfig                     | 1 +
 configs/k2e_evm_defconfig                        | 1 +
 configs/k2g_evm_defconfig                        | 1 +
 configs/k2hk_evm_defconfig                       | 1 +
 configs/k2l_evm_defconfig                        | 1 +
 configs/ls1021aqds_ddr4_nor_defconfig            | 1 +
 configs/ls1021aqds_ddr4_nor_lpuart_defconfig     | 1 +
 configs/ls1021aqds_nand_defconfig                | 1 +
 configs/ls1021aqds_nor_SECURE_BOOT_defconfig     | 1 +
 configs/ls1021aqds_nor_defconfig                 | 1 +
 configs/ls1021aqds_nor_lpuart_defconfig          | 1 +
 configs/ls1021aqds_qspi_defconfig                | 1 +
 configs/ls1021aqds_sdcard_ifc_defconfig          | 1 +
 configs/ls1021aqds_sdcard_qspi_defconfig         | 1 +
 configs/ls1021atwr_nor_SECURE_BOOT_defconfig     | 1 +
 configs/ls1021atwr_nor_defconfig                 | 1 +
 configs/ls1021atwr_nor_lpuart_defconfig          | 1 +
 configs/ls1021atwr_qspi_defconfig                | 1 +
 configs/ls1021atwr_sdcard_ifc_defconfig          | 1 +
 configs/ls1021atwr_sdcard_qspi_defconfig         | 1 +
 configs/ls1043aqds_defconfig                     | 1 +
 configs/ls1043aqds_lpuart_defconfig              | 1 +
 configs/ls1043aqds_nand_defconfig                | 1 +
 configs/ls1043aqds_nor_ddr3_defconfig            | 1 +
 configs/ls1043aqds_qspi_defconfig                | 1 +
 configs/ls1043aqds_sdcard_ifc_defconfig          | 1 +
 configs/ls1043aqds_sdcard_qspi_defconfig         | 1 +
 configs/ls1043ardb_SECURE_BOOT_defconfig         | 1 +
 configs/ls1043ardb_defconfig                     | 1 +
 configs/ls1043ardb_nand_defconfig                | 1 +
 configs/ls1043ardb_sdcard_defconfig              | 1 +
 configs/ls2080aqds_SECURE_BOOT_defconfig         | 1 +
 configs/ls2080aqds_defconfig                     | 1 +
 configs/ls2080aqds_nand_defconfig                | 1 +
 configs/ls2080ardb_SECURE_BOOT_defconfig         | 1 +
 configs/ls2080ardb_defconfig                     | 1 +
 configs/ls2080ardb_nand_defconfig                | 1 +
 configs/odroid-xu3_defconfig                     | 1 +
 configs/peach-pi_defconfig                       | 1 +
 configs/peach-pit_defconfig                      | 1 +
 configs/smdk5420_defconfig                       | 1 +
 configs/xilinx_zynqmp_ep_defconfig               | 1 +
 configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig | 1 +
 configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig | 1 +
 configs/xilinx_zynqmp_zcu102_defconfig           | 1 +
 configs/xilinx_zynqmp_zcu102_revB_defconfig      | 1 +
 drivers/usb/host/Kconfig                         | 6 ++++++
 include/configs/am43xx_evm.h                     | 1 -
 include/configs/am57xx_evm.h                     | 1 -
 include/configs/cm_t43.h                         | 1 -
 include/configs/dra7xx_evm.h                     | 1 -
 include/configs/exynos5-common.h                 | 1 -
 include/configs/ls1021aqds.h                     | 1 -
 include/configs/ls1021atwr.h                     | 1 -
 include/configs/ls1043aqds.h                     | 1 -
 include/configs/ls1043ardb.h                     | 1 -
 include/configs/ls2080aqds.h                     | 1 -
 include/configs/ls2080ardb.h                     | 1 -
 include/configs/ti_armv7_keystone2.h             | 1 -
 include/configs/xilinx_zynqmp.h                  | 1 -
 71 files changed, 63 insertions(+), 13 deletions(-)

configs/am437x_hs_evm_defconfig +1 -0

index a7d4041..3cd39eb 100644
@@ -43,6 +43,7 @@ CONFIG_TIMER=y
 CONFIG_OMAP_TIMER=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI_DWC3=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_DWC3_GADGET=y
 CONFIG_USB_DWC3_OMAP=y

configs/am43xx_evm_defconfig +1 -0

index e8a3d75..cb3de11 100644
@@ -43,6 +43,7 @@ CONFIG_TIMER=y
 CONFIG_OMAP_TIMER=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI_DWC3=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_DWC3_GADGET=y
 CONFIG_USB_DWC3_OMAP=y

configs/am43xx_evm_ethboot_defconfig +1 -0

index 2a85a34..3b958d7 100644
@@ -30,6 +30,7 @@ CONFIG_SYS_NS16550=y
 CONFIG_TI_QSPI=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI_DWC3=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_DWC3_GADGET=y
 CONFIG_USB_DWC3_OMAP=y

configs/am43xx_evm_qspiboot_defconfig +1 -0

index b4f1228..5264332 100644
@@ -30,6 +30,7 @@ CONFIG_SYS_NS16550=y
 CONFIG_TI_QSPI=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI_DWC3=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_DWC3_GADGET=y
 CONFIG_USB_DWC3_OMAP=y

configs/am43xx_evm_usbhost_boot_defconfig +1 -0

index e88a9e3..34c875e 100644
@@ -41,6 +41,7 @@ CONFIG_TIMER=y
 CONFIG_OMAP_TIMER=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI_DWC3=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_DWC3_GADGET=y
 CONFIG_USB_DWC3_OMAP=y

configs/am57xx_evm_defconfig +1 -0

index 815811f..6743b84 100644
@@ -35,3 +35,4 @@ CONFIG_SPI_FLASH_BAR=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI_DWC3=y

configs/am57xx_evm_nodt_defconfig +1 -0

index 373aa9e..1cf82d2 100644
@@ -24,4 +24,5 @@ CONFIG_CMD_FS_GENERIC=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI_DWC3=y
 CONFIG_OF_LIBFDT=y

configs/am57xx_hs_evm_defconfig +1 -0

index aa3d627..c109939 100644
@@ -36,3 +36,4 @@ CONFIG_SPI_FLASH_BAR=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI_DWC3=y

configs/cm_t43_defconfig +1 -0

index a8ffea7..b80ca0d 100644
@@ -39,4 +39,5 @@ CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI_DWC3=y
 CONFIG_OF_LIBFDT=y

configs/dra72_hs_evm_defconfig +1 -0

index 767e067..1a4082c 100644
@@ -45,6 +45,7 @@ CONFIG_TIMER=y
 CONFIG_OMAP_TIMER=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI_DWC3=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_DWC3_GADGET=y
 CONFIG_USB_DWC3_OMAP=y

configs/dra74_hs_evm_defconfig +1 -0

index e05efe0..edcdca0 100644
@@ -44,6 +44,7 @@ CONFIG_TIMER=y
 CONFIG_OMAP_TIMER=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI_DWC3=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_DWC3_GADGET=y
 CONFIG_USB_DWC3_OMAP=y

configs/dra7xx_evm_defconfig +1 -0

index 9ee579c..756af63 100644
@@ -43,6 +43,7 @@ CONFIG_TIMER=y
 CONFIG_OMAP_TIMER=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI_DWC3=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_DWC3_GADGET=y
 CONFIG_USB_DWC3_OMAP=y

configs/k2e_evm_defconfig +1 -0

index b1d4018..9fcdfe9 100644
@@ -34,3 +34,4 @@ CONFIG_DM_ETH=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI_DWC3=y

configs/k2g_evm_defconfig +1 -0

index 2c7167e..8efa58c 100644
@@ -34,3 +34,4 @@ CONFIG_REMOTEPROC_TI_POWER=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI_DWC3=y

configs/k2hk_evm_defconfig +1 -0

index 410de64..278eaf3 100644
@@ -34,3 +34,4 @@ CONFIG_DM_ETH=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI_DWC3=y

configs/k2l_evm_defconfig +1 -0

index 91d7a04..8417e0a 100644
@@ -34,3 +34,4 @@ CONFIG_DM_ETH=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI_DWC3=y

configs/ls1021aqds_ddr4_nor_defconfig +1 -0

index 92f7796..efaa7a9 100644
@@ -29,3 +29,4 @@ CONFIG_E1000=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI_DWC3=y

configs/ls1021aqds_ddr4_nor_lpuart_defconfig +1 -0

index 338dbf4..9fa5cb9 100644
@@ -29,3 +29,4 @@ CONFIG_E1000=y
 CONFIG_FSL_LPUART=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI_DWC3=y

configs/ls1021aqds_nand_defconfig +1 -0

index b3edd0a..24b7a15 100644
@@ -23,6 +23,7 @@ CONFIG_E1000=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI_DWC3=y
 CONFIG_OF_LIBFDT=y
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y

configs/ls1021aqds_nor_SECURE_BOOT_defconfig +1 -0

index 499fece..5d2b57d 100644
@@ -24,6 +24,7 @@ CONFIG_E1000=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI_DWC3=y
 CONFIG_RSA=y
 CONFIG_OF_LIBFDT=y
 CONFIG_FIT=y

configs/ls1021aqds_nor_defconfig +1 -0

index cf4f79d..426a4be 100644
@@ -28,3 +28,4 @@ CONFIG_E1000=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI_DWC3=y

configs/ls1021aqds_nor_lpuart_defconfig +1 -0

index 5ad9082..4f5c1e8 100644
@@ -29,3 +29,4 @@ CONFIG_E1000=y
 CONFIG_FSL_LPUART=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI_DWC3=y

configs/ls1021aqds_qspi_defconfig +1 -0

index 33484ed..6a791c0 100644
@@ -35,3 +35,4 @@ CONFIG_FSL_DSPI=y
 CONFIG_FSL_QSPI=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI_DWC3=y

configs/ls1021aqds_sdcard_ifc_defconfig +1 -0

index 0992718..33e5c0c 100644
@@ -27,3 +27,4 @@ CONFIG_E1000=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI_DWC3=y

configs/ls1021aqds_sdcard_qspi_defconfig +1 -0

index abb3287..45f0f73 100644
@@ -34,3 +34,4 @@ CONFIG_FSL_DSPI=y
 CONFIG_FSL_QSPI=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI_DWC3=y

configs/ls1021atwr_nor_SECURE_BOOT_defconfig +1 -0

index f3a9e35..16243ee 100644
@@ -24,6 +24,7 @@ CONFIG_E1000=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI_DWC3=y
 CONFIG_RSA=y
 CONFIG_OF_LIBFDT=y
 CONFIG_FIT=y

configs/ls1021atwr_nor_defconfig +1 -0

index be68631..3158340 100644
@@ -28,3 +28,4 @@ CONFIG_E1000=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI_DWC3=y

configs/ls1021atwr_nor_lpuart_defconfig +1 -0

index ec165b1..bbeb4bf 100644
@@ -29,3 +29,4 @@ CONFIG_E1000=y
 CONFIG_FSL_LPUART=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI_DWC3=y

configs/ls1021atwr_qspi_defconfig +1 -0

index c0a7967..6910c4e 100644
@@ -36,3 +36,4 @@ CONFIG_FSL_DSPI=y
 CONFIG_FSL_QSPI=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI_DWC3=y

configs/ls1021atwr_sdcard_ifc_defconfig +1 -0

index 1900c1a..f59ad74 100644
@@ -22,6 +22,7 @@ CONFIG_E1000=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI_DWC3=y
 CONFIG_OF_LIBFDT=y
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y

configs/ls1021atwr_sdcard_qspi_defconfig +1 -0

index 272dabd..90f810a 100644
@@ -36,3 +36,4 @@ CONFIG_FSL_DSPI=y
 CONFIG_FSL_QSPI=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI_DWC3=y

configs/ls1043aqds_defconfig +1 -0

index fa4270a..1fbfd38 100644
@@ -27,3 +27,4 @@ CONFIG_SPI_FLASH=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI_DWC3=y

configs/ls1043aqds_lpuart_defconfig +1 -0

index 2a845b6..6b628d3 100644
@@ -28,3 +28,4 @@ CONFIG_SPI_FLASH=y
 CONFIG_FSL_LPUART=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI_DWC3=y

configs/ls1043aqds_nand_defconfig +1 -0

index 20dc98b..90f870a 100644
@@ -28,3 +28,4 @@ CONFIG_SPI_FLASH=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI_DWC3=y

configs/ls1043aqds_nor_ddr3_defconfig +1 -0

index 829ed32..813c269 100644
@@ -26,3 +26,4 @@ CONFIG_SPI_FLASH=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI_DWC3=y

configs/ls1043aqds_qspi_defconfig +1 -0

index b6b98e3..e665ba4 100644
@@ -28,3 +28,4 @@ CONFIG_SPI_FLASH=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI_DWC3=y

configs/ls1043aqds_sdcard_ifc_defconfig +1 -0

index 40ae837..03a263a 100644
@@ -28,3 +28,4 @@ CONFIG_SPI_FLASH=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI_DWC3=y

configs/ls1043aqds_sdcard_qspi_defconfig +1 -0

index 8228d22..0062f5c 100644
@@ -29,3 +29,4 @@ CONFIG_SPI_FLASH=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI_DWC3=y

configs/ls1043ardb_SECURE_BOOT_defconfig +1 -0

index 9e4ab65..bace827 100644
@@ -23,4 +23,5 @@ CONFIG_SPI_FLASH=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI_DWC3=y
 CONFIG_RSA=y

configs/ls1043ardb_defconfig +1 -0

index 37a67b9..48a89ab 100644
@@ -23,3 +23,4 @@ CONFIG_SPI_FLASH=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI_DWC3=y

configs/ls1043ardb_nand_defconfig +1 -0

index e847312..627a90d 100644
@@ -24,3 +24,4 @@ CONFIG_SPI_FLASH=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI_DWC3=y

configs/ls1043ardb_sdcard_defconfig +1 -0

index e8a516b..c676a91 100644
@@ -24,3 +24,4 @@ CONFIG_SPI_FLASH=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI_DWC3=y

configs/ls2080aqds_SECURE_BOOT_defconfig +1 -0

index 14619fb..49a4a26 100644
@@ -31,5 +31,6 @@ CONFIG_SYS_NS16550=y
 CONFIG_FSL_DSPI=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI_DWC3=y
 CONFIG_RSA=y
 CONFIG_EFI_LOADER_BOUNCE_BUFFER=y

configs/ls2080aqds_defconfig +1 -0

index 2ca0117..c305345 100644
@@ -31,4 +31,5 @@ CONFIG_SYS_NS16550=y
 CONFIG_FSL_DSPI=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI_DWC3=y
 CONFIG_EFI_LOADER_BOUNCE_BUFFER=y

configs/ls2080aqds_nand_defconfig +1 -0

index 2af3687..8a6dd14 100644
@@ -24,5 +24,6 @@ CONFIG_E1000=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI_DWC3=y
 CONFIG_OF_LIBFDT=y
 CONFIG_EFI_LOADER_BOUNCE_BUFFER=y

configs/ls2080ardb_SECURE_BOOT_defconfig +1 -0

index 76a9c3d..a2d88cc 100644
@@ -31,5 +31,6 @@ CONFIG_SYS_NS16550=y
 CONFIG_FSL_DSPI=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI_DWC3=y
 CONFIG_RSA=y
 CONFIG_EFI_LOADER_BOUNCE_BUFFER=y

configs/ls2080ardb_defconfig +1 -0

index 82d14be..dc2b872 100644
@@ -31,4 +31,5 @@ CONFIG_SYS_NS16550=y
 CONFIG_FSL_DSPI=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI_DWC3=y
 CONFIG_EFI_LOADER_BOUNCE_BUFFER=y

configs/ls2080ardb_nand_defconfig +1 -0

index 17f0f6d..dbba8ab 100644
@@ -24,5 +24,6 @@ CONFIG_E1000=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI_DWC3=y
 CONFIG_OF_LIBFDT=y
 CONFIG_EFI_LOADER_BOUNCE_BUFFER=y

configs/odroid-xu3_defconfig +1 -0

index e78f973..49cfa8c 100644
@@ -37,6 +37,7 @@ CONFIG_DM_REGULATOR=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI_DWC3=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_DWC3_GADGET=y
 CONFIG_USB_DWC3_PHY_SAMSUNG=y

configs/peach-pi_defconfig +1 -0

index 9a815d0..3c403ba 100644
@@ -56,6 +56,7 @@ CONFIG_TPM_TIS_INFINEON=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI_DWC3=y
 CONFIG_VIDEO_BRIDGE=y
 CONFIG_VIDEO_BRIDGE_PARADE_PS862X=y
 CONFIG_TPM=y

configs/peach-pit_defconfig +1 -0

index 5bea937..bfa3614 100644
@@ -56,6 +56,7 @@ CONFIG_TPM_TIS_INFINEON=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI_DWC3=y
 CONFIG_VIDEO_BRIDGE=y
 CONFIG_VIDEO_BRIDGE_PARADE_PS862X=y
 CONFIG_TPM=y

configs/smdk5420_defconfig +1 -0

index ad599fc..3bda611 100644
@@ -37,4 +37,5 @@ CONFIG_EXYNOS_SPI=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI_DWC3=y
 CONFIG_VIDEO_BRIDGE=y

configs/xilinx_zynqmp_ep_defconfig +1 -0

index 2a5b2d9..ad94d56 100644
@@ -57,6 +57,7 @@ CONFIG_DEBUG_UART_CLOCK=25000000
 CONFIG_DEBUG_UART_ANNOUNCE=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI_DWC3=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_DWC3_GADGET=y
 CONFIG_USB_GADGET=y

configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig +1 -0

index 457393a..ad1566d 100644
@@ -50,6 +50,7 @@ CONFIG_DEBUG_UART_CLOCK=100000000
 CONFIG_DEBUG_UART_ANNOUNCE=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI_DWC3=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_DWC3_GADGET=y
 CONFIG_USB_ULPI_VIEWPORT=y

configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig +1 -0

index fe415cd..3aa80cb 100644
@@ -42,6 +42,7 @@ CONFIG_DM_ETH=y
 CONFIG_ZYNQ_GEM=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI_DWC3=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_DWC3_GADGET=y
 CONFIG_USB_ULPI_VIEWPORT=y

configs/xilinx_zynqmp_zcu102_defconfig +1 -0

index 6b76dbc..a216f11 100644
@@ -48,6 +48,7 @@ CONFIG_DEBUG_UART_CLOCK=100000000
 CONFIG_DEBUG_UART_ANNOUNCE=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI_DWC3=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_DWC3_GADGET=y
 CONFIG_USB_ULPI_VIEWPORT=y

configs/xilinx_zynqmp_zcu102_revB_defconfig +1 -0

index 1a3fb21..514176d 100644
@@ -48,6 +48,7 @@ CONFIG_DEBUG_UART_CLOCK=100000000
 CONFIG_DEBUG_UART_ANNOUNCE=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI_DWC3=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_DWC3_GADGET=y
 CONFIG_USB_ULPI_VIEWPORT=y

drivers/usb/host/Kconfig +6 -0

index 8a6f732..89580cc 100644
@@ -18,6 +18,12 @@ config USB_XHCI_UNIPHIER
 	---help---
 	  Enables support for the on-chip xHCI controller on UniPhier SoCs.
 
+config USB_XHCI_DWC3
+	bool "DesignWare USB3 DRD Core Support"
+	help
+	  Say Y or if your system has a Dual Role SuperSpeed
+	  USB controller based on the DesignWare USB3 IP Core.
+
 endif
 
 config USB_OHCI_GENERIC

include/configs/am43xx_evm.h +0 -1

index 170d069..361704b 100644
@@ -99,7 +99,6 @@
 #if defined(CONFIG_SPL_USB_HOST_SUPPORT) || !defined(CONFIG_SPL_BUILD)
 #define CONFIG_SYS_USB_FAT_BOOT_PARTITION		1
 #define CONFIG_USB_HOST
-#define CONFIG_USB_XHCI_DWC3
 #define CONFIG_USB_XHCI_OMAP
 #define CONFIG_USB_STORAGE
 #define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS 2

include/configs/am57xx_evm.h +0 -1

index 6a3d8e5..2db199d 100644
@@ -64,7 +64,6 @@
 
 /* USB xHCI HOST */
 #define CONFIG_USB_HOST
-#define CONFIG_USB_XHCI_DWC3
 #define CONFIG_USB_XHCI_OMAP
 #define CONFIG_USB_STORAGE
 #define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS 2

include/configs/cm_t43.h +0 -1

index 51eac93..5076540 100644
@@ -62,7 +62,6 @@
 /* USB support */
 #define CONFIG_USB_HOST
 #define CONFIG_USB_XHCI_OMAP
-#define CONFIG_USB_XHCI_DWC3
 #define CONFIG_USB_STORAGE
 #define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS 2
 #define CONFIG_OMAP_USB_PHY

include/configs/dra7xx_evm.h +0 -1

index 0571dc0..0d51aeb 100644
@@ -211,7 +211,6 @@
 
 /* USB xHCI HOST */
 #define CONFIG_USB_HOST
-#define CONFIG_USB_XHCI_DWC3
 #define CONFIG_USB_XHCI_OMAP
 #define CONFIG_USB_STORAGE
 #define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS 2

include/configs/exynos5-common.h +0 -1

index b2ff4dd..e614a7f 100644
@@ -157,7 +157,6 @@
 
 /* USB */
 #define CONFIG_USB_STORAGE
-#define CONFIG_USB_XHCI_DWC3
 #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS	3
 #define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS	2

include/configs/ls1021aqds.h +0 -1

index ac32240..1edf798 100644
@@ -450,7 +450,6 @@ unsigned long get_board_ddr_clk(void);
 
 #ifdef CONFIG_HAS_FSL_XHCI_USB
 #define CONFIG_USB_XHCI_FSL
-#define CONFIG_USB_XHCI_DWC3
 #define CONFIG_USB_MAX_CONTROLLER_COUNT		1
 #define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS	2
 #endif

include/configs/ls1021atwr.h +0 -1

index c38d680..30f5655 100644
@@ -57,7 +57,6 @@
 
 #ifdef CONFIG_HAS_FSL_XHCI_USB
 #define CONFIG_USB_XHCI_FSL
-#define CONFIG_USB_XHCI_DWC3
 #define CONFIG_USB_MAX_CONTROLLER_COUNT        1
 #define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS     2
 #endif

include/configs/ls1043aqds.h +0 -1

index 103bb2e..a19eaee 100644
@@ -389,7 +389,6 @@ unsigned long get_board_ddr_clk(void);
 #define CONFIG_HAS_FSL_XHCI_USB
 #ifdef CONFIG_HAS_FSL_XHCI_USB
 #define CONFIG_USB_XHCI_FSL
-#define CONFIG_USB_XHCI_DWC3
 #define CONFIG_USB_MAX_CONTROLLER_COUNT		3
 #define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS	2
 #define CONFIG_USB_STORAGE

include/configs/ls1043ardb.h +0 -1

index 0a71637..94ddfb1 100644
@@ -279,7 +279,6 @@
 #define CONFIG_HAS_FSL_XHCI_USB
 #ifdef CONFIG_HAS_FSL_XHCI_USB
 #define CONFIG_USB_XHCI_FSL
-#define CONFIG_USB_XHCI_DWC3
 #define CONFIG_USB_MAX_CONTROLLER_COUNT		3
 #define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS	2
 #define CONFIG_USB_STORAGE

include/configs/ls2080aqds.h +0 -1

index 743473f..b44066c 100644
@@ -384,7 +384,6 @@ unsigned long get_board_ddr_clk(void);
  */
 #define CONFIG_HAS_FSL_XHCI_USB
 #define CONFIG_USB_XHCI_FSL
-#define CONFIG_USB_XHCI_DWC3
 #define CONFIG_USB_MAX_CONTROLLER_COUNT		2
 #define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS	2
 #define CONFIG_USB_STORAGE

include/configs/ls2080ardb.h +0 -1

index 1fe4138..86a49a5 100644
@@ -317,7 +317,6 @@ unsigned long get_board_sys_clk(void);
  */
 #define CONFIG_HAS_FSL_XHCI_USB
 #define CONFIG_USB_XHCI_FSL
-#define CONFIG_USB_XHCI_DWC3
 #define CONFIG_USB_MAX_CONTROLLER_COUNT         2
 #define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS      2
 #define CONFIG_USB_STORAGE

include/configs/ti_armv7_keystone2.h +0 -1

index 2292eb2..707106f 100644
@@ -191,7 +191,6 @@
 					"-(ubifs)"
 
 /* USB Configuration */
-#define CONFIG_USB_XHCI_DWC3
 #define CONFIG_USB_XHCI_KEYSTONE
 #define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS	2
 #define CONFIG_USB_STORAGE

include/configs/xilinx_zynqmp.h +0 -1

index b0e0c22..8a1142b 100644
@@ -117,7 +117,6 @@
 #define CONFIG_SYS_LOAD_ADDR		0x8000000
 
 #if defined(CONFIG_ZYNQMP_USB)
-#define CONFIG_USB_XHCI_DWC3
 #define CONFIG_USB_MAX_CONTROLLER_COUNT         1
 #define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS      2
 #define CONFIG_USB_STORAGE

Signature · 1 line

1.9.1

Marek Vasut

Applied

2016-06-03 22:44 UTC #4 lore raw

v3 cover usb: Move some CONFIGs to Kconfig

In reply to Masahiro Yamada

Quoted 3 lines · Masahiro Yamada

The patches in u-boot-usb are stale now,
so I regenerated new ones based on
commit 8b528709c5bba6a8d0ec83b20545bbd75f082704.

Applied all three instead, thanks

Quoted 94 lines

I tested it with buildman against all boards.

Masahiro Yamada (3):
configs: blackfin: move CONFIG_USB to defconfig
usb: move CONFIG_USB_XHCI to Kconfig with renaming
usb: move CONFIG_USB_XHCI_DWC3 to Kconfig

 common/usb.c                                     |  2 +-
 configs/am437x_hs_evm_defconfig                  |  2 ++
 configs/am43xx_evm_defconfig                     |  2 ++
 configs/am43xx_evm_ethboot_defconfig             |  2 ++
 configs/am43xx_evm_qspiboot_defconfig            |  2 ++
 configs/am43xx_evm_usbhost_boot_defconfig        |  2 ++
 configs/am57xx_evm_defconfig                     |  3 +++
 configs/am57xx_evm_nodt_defconfig                |  3 +++
 configs/am57xx_hs_evm_defconfig                  |  3 +++
 configs/bf526-ezbrd_defconfig                    |  1 +
 configs/bf527-ezkit-v2_defconfig                 |  1 +
 configs/bf527-ezkit_defconfig                    |  1 +
 configs/bf548-ezkit_defconfig                    |  1 +
 configs/cm_t43_defconfig                         |  3 +++
 configs/dra72_hs_evm_defconfig                   |  2 ++
 configs/dra74_hs_evm_defconfig                   |  2 ++
 configs/dra7xx_evm_defconfig                     |  2 ++
 configs/k2e_evm_defconfig                        |  3 +++
 configs/k2g_evm_defconfig                        |  3 +++
 configs/k2hk_evm_defconfig                       |  3 +++
 configs/k2l_evm_defconfig                        |  3 +++
 configs/ls1021aqds_ddr4_nor_defconfig            |  3 +++
 configs/ls1021aqds_ddr4_nor_lpuart_defconfig     |  3 +++
 configs/ls1021aqds_nand_defconfig                |  3 +++
 configs/ls1021aqds_nor_SECURE_BOOT_defconfig     |  3 +++
 configs/ls1021aqds_nor_defconfig                 |  3 +++
 configs/ls1021aqds_nor_lpuart_defconfig          |  3 +++
 configs/ls1021aqds_qspi_defconfig                |  3 +++
 configs/ls1021aqds_sdcard_ifc_defconfig          |  3 +++
 configs/ls1021aqds_sdcard_qspi_defconfig         |  3 +++
 configs/ls1021atwr_nor_SECURE_BOOT_defconfig     |  3 +++
 configs/ls1021atwr_nor_defconfig                 |  3 +++
 configs/ls1021atwr_nor_lpuart_defconfig          |  3 +++
 configs/ls1021atwr_qspi_defconfig                |  3 +++
 configs/ls1021atwr_sdcard_ifc_defconfig          |  3 +++
 configs/ls1021atwr_sdcard_qspi_defconfig         |  3 +++
 configs/ls1043aqds_defconfig                     |  3 +++
 configs/ls1043aqds_lpuart_defconfig              |  3 +++
 configs/ls1043aqds_nand_defconfig                |  3 +++
 configs/ls1043aqds_nor_ddr3_defconfig            |  3 +++
 configs/ls1043aqds_qspi_defconfig                |  3 +++
 configs/ls1043aqds_sdcard_ifc_defconfig          |  3 +++
 configs/ls1043aqds_sdcard_qspi_defconfig         |  3 +++
 configs/ls1043ardb_SECURE_BOOT_defconfig         |  3 +++
 configs/ls1043ardb_defconfig                     |  3 +++
 configs/ls1043ardb_nand_defconfig                |  3 +++
 configs/ls1043ardb_sdcard_defconfig              |  3 +++
 configs/ls2080aqds_SECURE_BOOT_defconfig         |  3 +++
 configs/ls2080aqds_defconfig                     |  3 +++
 configs/ls2080aqds_nand_defconfig                |  3 +++
 configs/ls2080ardb_SECURE_BOOT_defconfig         |  3 +++
 configs/ls2080ardb_defconfig                     |  3 +++
 configs/ls2080ardb_nand_defconfig                |  3 +++
 configs/odroid-xu3_defconfig                     |  2 ++
 configs/peach-pi_defconfig                       |  2 ++
 configs/peach-pit_defconfig                      |  2 ++
 configs/smdk5420_defconfig                       |  2 ++
 configs/xilinx_zynqmp_ep_defconfig               |  2 ++
 configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig |  2 ++
 configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig |  2 ++
 configs/xilinx_zynqmp_zcu102_defconfig           |  2 ++
 configs/xilinx_zynqmp_zcu102_revB_defconfig      |  2 ++
 drivers/usb/host/Kconfig                         | 12 ++++++------
 drivers/usb/host/Makefile                        |  2 +-
 include/configs/am43xx_evm.h                     |  2 --
 include/configs/am57xx_evm.h                     |  2 --
 include/configs/bf526-ezbrd.h                    |  1 -
 include/configs/bf527-ezkit.h                    |  1 -
 include/configs/bf548-ezkit.h                    |  1 -
 include/configs/cm_t43.h                         |  2 --
 include/configs/dra7xx_evm.h                     |  2 --
 include/configs/ds414.h                          |  3 +--
 include/configs/exynos5-common.h                 |  1 -
 include/configs/exynos5420-common.h              |  1 -
 include/configs/ls1021aqds.h                     |  2 --
 include/configs/ls1021atwr.h                     |  2 --
 include/configs/ls1043aqds.h                     |  2 --
 include/configs/ls1043ardb.h                     |  2 --
 include/configs/ls2080aqds.h                     |  2 --
 include/configs/ls2080ardb.h                     |  2 --
 include/configs/smdk5420.h                       |  1 -
 include/configs/ti_armv7_keystone2.h             |  2 --
 include/configs/xilinx_zynqmp.h                  |  2 --
 83 files changed, 167 insertions(+), 40 deletions(-)

Signature · 2 lines

Best regards,
Marek Vasut

Masahiro Yamada

author

2016-06-05 01:42 UTC #5 lore raw

v3 cover usb: Move some CONFIGs to Kconfig

2016-06-04 7:44 GMT+09:00 Marek Vasut <[email protected]>:

Quoted 6 lines · Masahiro Yamada

Quoted 3 lines
The patches in u-boot-usb are stale now,
so I regenerated new ones based on
commit 8b528709c5bba6a8d0ec83b20545bbd75f082704.
Applied all three instead, thanks

Then, please send a PR soon.
(This series should be applied onto b2f18584 too,
but will become stale again soon.)

Signature · 2 lines

Best Regards
Masahiro Yamada