diff options
| author | Michal Simek <michal.simek@xilinx.com> | 2016-12-21 14:18:31 +0100 |
|---|---|---|
| committer | Marek Vasut <marek.vasut@gmail.com> | 2017-01-17 10:26:21 +0100 |
| commit | 63d747477be2f6f948760f2dc9ce0f440c0af45c (patch) | |
| tree | 0cade2a175f9f1aabea565654e9396c98c3a3617 | |
| parent | b984700ca4b98597825fbc79c47e7a621889adaf (diff) | |
| download | u-boot-imx-63d747477be2f6f948760f2dc9ce0f440c0af45c.zip u-boot-imx-63d747477be2f6f948760f2dc9ce0f440c0af45c.tar.gz u-boot-imx-63d747477be2f6f948760f2dc9ce0f440c0af45c.tar.bz2 | |
drivers: usb: Add USB_XHCI_ZYNQMP to Kconfig
Move symbol to Kconfig to cleanup configuration file.
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
| -rw-r--r-- | configs/xilinx_zynqmp_ep_defconfig | 1 | ||||
| -rw-r--r-- | configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig | 1 | ||||
| -rw-r--r-- | configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig | 1 | ||||
| -rw-r--r-- | configs/xilinx_zynqmp_zcu102_defconfig | 1 | ||||
| -rw-r--r-- | configs/xilinx_zynqmp_zcu102_revB_defconfig | 1 | ||||
| -rw-r--r-- | drivers/usb/host/Kconfig | 6 | ||||
| -rw-r--r-- | include/configs/xilinx_zynqmp.h | 1 | ||||
| -rw-r--r-- | scripts/config_whitelist.txt | 1 |
8 files changed, 11 insertions, 2 deletions
diff --git a/configs/xilinx_zynqmp_ep_defconfig b/configs/xilinx_zynqmp_ep_defconfig index ef7bf8b..5a564a6 100644 --- a/configs/xilinx_zynqmp_ep_defconfig +++ b/configs/xilinx_zynqmp_ep_defconfig @@ -66,6 +66,7 @@ CONFIG_DEBUG_UART_ANNOUNCE=y CONFIG_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y +CONFIG_USB_XHCI_ZYNQMP=y CONFIG_USB_DWC3=y CONFIG_USB_DWC3_GADGET=y CONFIG_USB_STORAGE=y diff --git a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig index 9da0306..41fcc8d 100644 --- a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig +++ b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig @@ -58,6 +58,7 @@ CONFIG_DEBUG_UART_ANNOUNCE=y CONFIG_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y +CONFIG_USB_XHCI_ZYNQMP=y CONFIG_USB_DWC3=y CONFIG_USB_DWC3_GADGET=y CONFIG_USB_ULPI_VIEWPORT=y diff --git a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig index d0b19f4..c09d4ba 100644 --- a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig +++ b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig @@ -58,6 +58,7 @@ CONFIG_DEBUG_UART_ANNOUNCE=y CONFIG_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y +CONFIG_USB_XHCI_ZYNQMP=y CONFIG_USB_DWC3=y CONFIG_USB_DWC3_GADGET=y CONFIG_USB_ULPI_VIEWPORT=y diff --git a/configs/xilinx_zynqmp_zcu102_defconfig b/configs/xilinx_zynqmp_zcu102_defconfig index 71ada10..09cf4e1 100644 --- a/configs/xilinx_zynqmp_zcu102_defconfig +++ b/configs/xilinx_zynqmp_zcu102_defconfig @@ -58,6 +58,7 @@ CONFIG_DEBUG_UART_ANNOUNCE=y CONFIG_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y +CONFIG_USB_XHCI_ZYNQMP=y CONFIG_USB_DWC3=y CONFIG_USB_DWC3_GADGET=y CONFIG_USB_ULPI_VIEWPORT=y diff --git a/configs/xilinx_zynqmp_zcu102_revB_defconfig b/configs/xilinx_zynqmp_zcu102_revB_defconfig index 64aa32f..98209ba 100644 --- a/configs/xilinx_zynqmp_zcu102_revB_defconfig +++ b/configs/xilinx_zynqmp_zcu102_revB_defconfig @@ -58,6 +58,7 @@ CONFIG_DEBUG_UART_ANNOUNCE=y CONFIG_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y +CONFIG_USB_XHCI_ZYNQMP=y CONFIG_USB_DWC3=y CONFIG_USB_DWC3_GADGET=y CONFIG_USB_ULPI_VIEWPORT=y diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig index b9c5fbe..5129a57 100644 --- a/drivers/usb/host/Kconfig +++ b/drivers/usb/host/Kconfig @@ -37,6 +37,12 @@ config USB_XHCI_ROCKCHIP help Enables support for the on-chip xHCI controller on Rockchip SoCs. +config USB_XHCI_ZYNQMP + bool "Support for Xilinx ZynqMP on-chip xHCI USB controller" + depends on ARCH_ZYNQMP + help + Enables support for the on-chip xHCI controller on Xilinx ZynqMP SoCs. + endif # USB_XHCI_HCD config USB_EHCI_HCD diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index bb749c5..9be9d47 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -109,7 +109,6 @@ #if defined(CONFIG_ZYNQMP_USB) #define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS 2 -#define CONFIG_USB_XHCI_ZYNQMP #define CONFIG_SYS_DFU_DATA_BUF_SIZE 0x1800000 #define DFU_DEFAULT_POLL_TIMEOUT 300 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 4935b91..12c7878 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -6819,7 +6819,6 @@ CONFIG_USB_XHCI_FSL CONFIG_USB_XHCI_KEYSTONE CONFIG_USB_XHCI_OMAP CONFIG_USB_XHCI_PCI -CONFIG_USB_XHCI_ZYNQMP CONFIG_USER_LOWLEVEL_INIT CONFIG_USE_FDT CONFIG_USE_INTERRUPT |