| Message ID | ee72a489d9bd89c73ac6ac07f602dc196a069fe2.1482326308.git.michal.simek@xilinx.com |
|---|---|
| State | Deferred |
| Delegated to: | Tom Rini |
| Headers | show |
On 12/21/2016 02:18 PM, Michal Simek wrote: > Move symbol to Kconfig to cleanup configuration file. > > Signed-off-by: Michal Simek <michal.simek@xilinx.com> Reviewed-by: Marek Vasut <marex@denx.de> > --- > > 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/xilinx_zynqmp.h | 1 - > 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 b223e110c86a..68475ac8e6cb 100644 > --- a/configs/xilinx_zynqmp_ep_defconfig > +++ b/configs/xilinx_zynqmp_ep_defconfig > @@ -65,6 +65,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 e3cfcee05971..4dc2197c83a0 100644 > --- a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig > +++ b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig > @@ -56,6 +56,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 f8f596f9df7a..2c46727f7410 100644 > --- a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig > +++ b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig > @@ -57,6 +57,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 9f2df491ec54..e8cf047e7aed 100644 > --- a/configs/xilinx_zynqmp_zcu102_defconfig > +++ b/configs/xilinx_zynqmp_zcu102_defconfig > @@ -57,6 +57,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 b2b1720a03d1..53bac1267e28 100644 > --- a/configs/xilinx_zynqmp_zcu102_revB_defconfig > +++ b/configs/xilinx_zynqmp_zcu102_revB_defconfig > @@ -57,6 +57,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 b9c5fbe381fb..5129a573042c 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 ce95aefbd936..b095d1f97882 100644 > --- a/include/configs/xilinx_zynqmp.h > +++ b/include/configs/xilinx_zynqmp.h > @@ -111,7 +111,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 8814841e1f44..6b0acd280c74 100644 > --- a/scripts/config_whitelist.txt > +++ b/scripts/config_whitelist.txt > @@ -8110,7 +8110,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_ARCH_MEMCPY > CONFIG_USE_ARCH_MEMSET >
On 22 December 2016 at 02:18, Michal Simek <michal.simek@xilinx.com> wrote: > Move symbol to Kconfig to cleanup configuration file. > > Signed-off-by: Michal Simek <michal.simek@xilinx.com> > --- > > 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/xilinx_zynqmp.h | 1 - > scripts/config_whitelist.txt | 1 - > 8 files changed, 11 insertions(+), 2 deletions(-) Reviewed-by: Simon Glass <sjg@chromium.org>
On 12/21/2016 02:18 PM, Michal Simek wrote: > Move symbol to Kconfig to cleanup configuration file. > > Signed-off-by: Michal Simek <michal.simek@xilinx.com> Applied to u-boot-usb/master, thanks.
diff --git a/configs/xilinx_zynqmp_ep_defconfig b/configs/xilinx_zynqmp_ep_defconfig index b223e110c86a..68475ac8e6cb 100644 --- a/configs/xilinx_zynqmp_ep_defconfig +++ b/configs/xilinx_zynqmp_ep_defconfig @@ -65,6 +65,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 e3cfcee05971..4dc2197c83a0 100644 --- a/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig +++ b/configs/xilinx_zynqmp_zc1751_xm015_dc1_defconfig @@ -56,6 +56,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 f8f596f9df7a..2c46727f7410 100644 --- a/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig +++ b/configs/xilinx_zynqmp_zc1751_xm016_dc2_defconfig @@ -57,6 +57,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 9f2df491ec54..e8cf047e7aed 100644 --- a/configs/xilinx_zynqmp_zcu102_defconfig +++ b/configs/xilinx_zynqmp_zcu102_defconfig @@ -57,6 +57,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 b2b1720a03d1..53bac1267e28 100644 --- a/configs/xilinx_zynqmp_zcu102_revB_defconfig +++ b/configs/xilinx_zynqmp_zcu102_revB_defconfig @@ -57,6 +57,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 b9c5fbe381fb..5129a573042c 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 ce95aefbd936..b095d1f97882 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -111,7 +111,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 8814841e1f44..6b0acd280c74 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -8110,7 +8110,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_ARCH_MEMCPY CONFIG_USE_ARCH_MEMSET
Move symbol to Kconfig to cleanup configuration file. Signed-off-by: Michal Simek <michal.simek@xilinx.com> --- 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/xilinx_zynqmp.h | 1 - scripts/config_whitelist.txt | 1 - 8 files changed, 11 insertions(+), 2 deletions(-)