Merge branch 'master' of git://git.denx.de/u-boot-usb
Modified: configs/ls1012afrdm_qspi_defconfig configs/ls1012aqds_qspi_defconfig configs/ls1012ardb_qspi_defconfig include/configs/ls1012afrdm.h include/configs/ls1012aqds.h include/configs/ls1012ardb.h Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
@@ -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
|
||||
@@ -24,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
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user