[U-Boot] [PATCH v2] usb: Kconfig: Add Kconfigs entry USB_EHCI_ZYNQ
Michal Simek
michal.simek at xilinx.com
Fri Jul 22 13:31:57 CEST 2016
On 22.7.2016 11:21, Siva Durga Prasad Paladugu wrote:
> Add Kconfig entry config option for USB_EHCI_ZYNQ
> and update the same to enable for all zynq boards
> which supports USB
>
> Signed-off-by: Siva Durga Prasad Paladugu <sivadur at xilinx.com>
> ---
> Changes for v2:
> - Made CONFIG_USB_EHCI_ZYNQ as default y as
> per review comment
> ---
> configs/zynq_microzed_defconfig | 2 ++
> configs/zynq_picozed_defconfig | 2 ++
> configs/zynq_zc702_defconfig | 2 ++
> configs/zynq_zc706_defconfig | 2 ++
> configs/zynq_zed_defconfig | 2 ++
> configs/zynq_zybo_defconfig | 2 ++
> drivers/usb/host/Kconfig | 7 +++++++
> include/configs/zynq-common.h | 4 +---
> include/configs/zynq_microzed.h | 2 --
> include/configs/zynq_picozed.h | 2 --
> include/configs/zynq_zc70x.h | 1 -
> include/configs/zynq_zed.h | 2 --
> include/configs/zynq_zybo.h | 1 -
> 13 files changed, 20 insertions(+), 11 deletions(-)
>
> diff --git a/configs/zynq_microzed_defconfig b/configs/zynq_microzed_defconfig
> index d88c61b..d47c217 100644
> --- a/configs/zynq_microzed_defconfig
> +++ b/configs/zynq_microzed_defconfig
> @@ -38,6 +38,8 @@ CONFIG_SPI_FLASH_WINBOND=y
> CONFIG_ZYNQ_GEM=y
> CONFIG_ZYNQ_QSPI=y
> CONFIG_USB=y
> +CONFIG_USB_EHCI_HCD=y
> +CONFIG_USB_EHCI=y
> CONFIG_USB_ULPI_VIEWPORT=y
> CONFIG_USB_ULPI=y
> CONFIG_USB_GADGET=y
> diff --git a/configs/zynq_picozed_defconfig b/configs/zynq_picozed_defconfig
> index aeb1270..2b07633 100644
> --- a/configs/zynq_picozed_defconfig
> +++ b/configs/zynq_picozed_defconfig
> @@ -28,6 +28,8 @@ CONFIG_SPL_DM_SEQ_ALIAS=y
> CONFIG_ZYNQ_SDHCI=y
> CONFIG_ZYNQ_GEM=y
> CONFIG_USB=y
> +CONFIG_USB_EHCI_HCD=y
> +CONFIG_USB_EHCI=y
> CONFIG_USB_ULPI_VIEWPORT=y
> CONFIG_USB_ULPI=y
> CONFIG_USB_GADGET=y
> diff --git a/configs/zynq_zc702_defconfig b/configs/zynq_zc702_defconfig
> index d68ed0e..a5484c6 100644
> --- a/configs/zynq_zc702_defconfig
> +++ b/configs/zynq_zc702_defconfig
> @@ -43,6 +43,8 @@ CONFIG_DEBUG_UART_BASE=0xe0001000
> CONFIG_DEBUG_UART_CLOCK=50000000
> CONFIG_ZYNQ_QSPI=y
> CONFIG_USB=y
> +CONFIG_USB_EHCI_HCD=y
> +CONFIG_USB_EHCI=y
> CONFIG_USB_ULPI_VIEWPORT=y
> CONFIG_USB_ULPI=y
> CONFIG_USB_GADGET=y
> diff --git a/configs/zynq_zc706_defconfig b/configs/zynq_zc706_defconfig
> index 8bd9230..ffb4053 100644
> --- a/configs/zynq_zc706_defconfig
> +++ b/configs/zynq_zc706_defconfig
> @@ -39,6 +39,8 @@ CONFIG_SPI_FLASH_WINBOND=y
> CONFIG_ZYNQ_GEM=y
> CONFIG_ZYNQ_QSPI=y
> CONFIG_USB=y
> +CONFIG_USB_EHCI_HCD=y
> +CONFIG_USB_EHCI=y
> CONFIG_USB_ULPI_VIEWPORT=y
> CONFIG_USB_ULPI=y
> CONFIG_USB_GADGET=y
> diff --git a/configs/zynq_zed_defconfig b/configs/zynq_zed_defconfig
> index c70b860..d9d8f67 100644
> --- a/configs/zynq_zed_defconfig
> +++ b/configs/zynq_zed_defconfig
> @@ -38,6 +38,8 @@ CONFIG_SPI_FLASH_WINBOND=y
> CONFIG_ZYNQ_GEM=y
> CONFIG_ZYNQ_QSPI=y
> CONFIG_USB=y
> +CONFIG_USB_EHCI_HCD=y
> +CONFIG_USB_EHCI=y
> CONFIG_USB_ULPI_VIEWPORT=y
> CONFIG_USB_ULPI=y
> CONFIG_USB_GADGET=y
> diff --git a/configs/zynq_zybo_defconfig b/configs/zynq_zybo_defconfig
> index 624545e..7dbfe76 100644
> --- a/configs/zynq_zybo_defconfig
> +++ b/configs/zynq_zybo_defconfig
> @@ -41,6 +41,8 @@ CONFIG_DEBUG_UART_BASE=0xe0001000
> CONFIG_DEBUG_UART_CLOCK=50000000
> CONFIG_ZYNQ_QSPI=y
> CONFIG_USB=y
> +CONFIG_USB_EHCI_HCD=y
> +CONFIG_USB_EHCI=y
> CONFIG_USB_ULPI_VIEWPORT=y
> CONFIG_USB_ULPI=y
> CONFIG_USB_GADGET=y
> diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
> index 89580cc..5092251 100644
> --- a/drivers/usb/host/Kconfig
> +++ b/drivers/usb/host/Kconfig
> @@ -85,6 +85,13 @@ config USB_EHCI_MSM
> This driver supports combination of Chipidea USB controller
> and Synapsys USB PHY in host mode only.
>
> +config USB_EHCI_ZYNQ
> + bool "Support for Xilinx Zynq on-chip EHCI USB controller"
> + depends on ARCH_ZYNQ
> + default y
> + ---help---
> + Enable support for Zynq on-chip EHCI USB controller
> +
> config USB_EHCI_GENERIC
> bool "Support for generic EHCI USB controller"
> depends on OF_CONTROL
> diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
> index 8dbac87..08b7602 100644
> --- a/include/configs/zynq-common.h
> +++ b/include/configs/zynq-common.h
> @@ -86,10 +86,8 @@
> # define CONFIG_ZYNQ_SDHCI_MAX_FREQ 52000000
> #endif
>
> -#ifdef CONFIG_ZYNQ_USB
> -# define CONFIG_USB_EHCI
> +#ifdef CONFIG_USB_EHCI_ZYNQ
> # define CONFIG_USB_STORAGE
> -# define CONFIG_USB_EHCI_ZYNQ
> # define CONFIG_EHCI_IS_TDI
> # define CONFIG_USB_MAX_CONTROLLER_COUNT 2
>
> diff --git a/include/configs/zynq_microzed.h b/include/configs/zynq_microzed.h
> index ec7bb1c..e66088d 100644
> --- a/include/configs/zynq_microzed.h
> +++ b/include/configs/zynq_microzed.h
> @@ -12,8 +12,6 @@
>
> #define CONFIG_SYS_NO_FLASH
>
> -#define CONFIG_ZYNQ_USB
> -
> #include <configs/zynq-common.h>
>
> #endif /* __CONFIG_ZYNQ_MICROZED_H */
> diff --git a/include/configs/zynq_picozed.h b/include/configs/zynq_picozed.h
> index adc4d0f..f2598a2 100644
> --- a/include/configs/zynq_picozed.h
> +++ b/include/configs/zynq_picozed.h
> @@ -12,8 +12,6 @@
>
> #define CONFIG_SYS_NO_FLASH
>
> -#define CONFIG_ZYNQ_USB
> -
> #include <configs/zynq-common.h>
>
> #endif /* __CONFIG_ZYNQ_PICOZED_H */
> diff --git a/include/configs/zynq_zc70x.h b/include/configs/zynq_zc70x.h
> index 8a04590..a27b49c 100644
> --- a/include/configs/zynq_zc70x.h
> +++ b/include/configs/zynq_zc70x.h
> @@ -12,7 +12,6 @@
>
> #define CONFIG_SYS_NO_FLASH
>
> -#define CONFIG_ZYNQ_USB
> #define CONFIG_ZYNQ_I2C0
> #define CONFIG_ZYNQ_EEPROM
>
> diff --git a/include/configs/zynq_zed.h b/include/configs/zynq_zed.h
> index 150cb4a..dbb4621 100644
> --- a/include/configs/zynq_zed.h
> +++ b/include/configs/zynq_zed.h
> @@ -12,8 +12,6 @@
>
> #define CONFIG_SYS_NO_FLASH
>
> -#define CONFIG_ZYNQ_USB
> -
> #include <configs/zynq-common.h>
>
> #endif /* __CONFIG_ZYNQ_ZED_H */
> diff --git a/include/configs/zynq_zybo.h b/include/configs/zynq_zybo.h
> index 637b1c5..ca3ad9c 100644
> --- a/include/configs/zynq_zybo.h
> +++ b/include/configs/zynq_zybo.h
> @@ -13,7 +13,6 @@
>
> #define CONFIG_SYS_NO_FLASH
>
> -#define CONFIG_ZYNQ_USB
> #define CONFIG_ZYNQ_I2C0
> #define CONFIG_ZYNQ_I2C1
> #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1
>
Based on my discussion with Marek. Applied to xilinx tree.
Thanks,
Michal
More information about the U-Boot
mailing list