Skip to content
Snippets Groups Projects
Commit 5493a32c authored by Mateusz Kulikowski's avatar Mateusz Kulikowski Committed by Tom Rini
Browse files

Migrate CONFIG_ULPI* to Kconfig


Move CONFIG_USB_ULPI* from headers to defconfigs for boards that use it.
Also - add CONFIG_USB where necesarry - all boards use it,
but some are not defining it explicitly.

Affected boards:
colibri_t20, harmony, mcx, mt_ventoux, twister,
zynq_(picozed, zc702, zc706, zed, zybo)

Signed-off-by: default avatarMateusz Kulikowski <mateusz.kulikowski@gmail.com>
Reviewed-by: default avatarSimon Glass <sjg@chromium.org>
parent 6b14fbbd
No related branches found
No related tags found
No related merge requests found
...@@ -21,4 +21,6 @@ CONFIG_DM_USB=y ...@@ -21,4 +21,6 @@ CONFIG_DM_USB=y
CONFIG_USB_GADGET=y CONFIG_USB_GADGET=y
CONFIG_DM_VIDEO=y CONFIG_DM_VIDEO=y
CONFIG_VIDEO_TEGRA20=y CONFIG_VIDEO_TEGRA20=y
CONFIG_USB_ULPI=y
CONFIG_USB_ULPI_VIEWPORT=y
CONFIG_USE_PRIVATE_LIBGCC=y CONFIG_USE_PRIVATE_LIBGCC=y
...@@ -21,4 +21,6 @@ CONFIG_USB=y ...@@ -21,4 +21,6 @@ CONFIG_USB=y
CONFIG_DM_USB=y CONFIG_DM_USB=y
CONFIG_DM_VIDEO=y CONFIG_DM_VIDEO=y
CONFIG_VIDEO_TEGRA20=y CONFIG_VIDEO_TEGRA20=y
CONFIG_USB_ULPI=y
CONFIG_USB_ULPI_VIEWPORT=y
CONFIG_USE_PRIVATE_LIBGCC=y CONFIG_USE_PRIVATE_LIBGCC=y
...@@ -12,3 +12,6 @@ CONFIG_CMD_GPIO=y ...@@ -12,3 +12,6 @@ CONFIG_CMD_GPIO=y
# CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_SETEXPR is not set
CONFIG_SYS_NS16550=y CONFIG_SYS_NS16550=y
CONFIG_OF_LIBFDT=y CONFIG_OF_LIBFDT=y
CONFIG_USB=y
CONFIG_USB_ULPI=y
CONFIG_USB_ULPI_VIEWPORT_OMAP=y
...@@ -10,3 +10,6 @@ CONFIG_CMD_GPIO=y ...@@ -10,3 +10,6 @@ CONFIG_CMD_GPIO=y
# CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_SETEXPR is not set
CONFIG_SYS_NS16550=y CONFIG_SYS_NS16550=y
CONFIG_OF_LIBFDT=y CONFIG_OF_LIBFDT=y
CONFIG_USB=y
CONFIG_USB_ULPI=y
CONFIG_USB_ULPI_VIEWPORT_OMAP=y
...@@ -10,3 +10,6 @@ CONFIG_CMD_GPIO=y ...@@ -10,3 +10,6 @@ CONFIG_CMD_GPIO=y
# CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_SETEXPR is not set
CONFIG_SYS_NS16550=y CONFIG_SYS_NS16550=y
CONFIG_OF_LIBFDT=y CONFIG_OF_LIBFDT=y
CONFIG_USB=y
CONFIG_USB_ULPI=y
CONFIG_USB_ULPI_VIEWPORT_OMAP=y
...@@ -14,3 +14,5 @@ CONFIG_ZYNQ_SDHCI=y ...@@ -14,3 +14,5 @@ CONFIG_ZYNQ_SDHCI=y
CONFIG_ZYNQ_GEM=y CONFIG_ZYNQ_GEM=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_USB_GADGET=y CONFIG_USB_GADGET=y
CONFIG_USB_ULPI=y
CONFIG_USB_ULPI_VIEWPORT=y
...@@ -26,3 +26,5 @@ CONFIG_DEBUG_UART_CLOCK=50000000 ...@@ -26,3 +26,5 @@ CONFIG_DEBUG_UART_CLOCK=50000000
CONFIG_ZYNQ_QSPI=y CONFIG_ZYNQ_QSPI=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_USB_GADGET=y CONFIG_USB_GADGET=y
CONFIG_USB_ULPI=y
CONFIG_USB_ULPI_VIEWPORT=y
...@@ -23,3 +23,5 @@ CONFIG_ZYNQ_GEM=y ...@@ -23,3 +23,5 @@ CONFIG_ZYNQ_GEM=y
CONFIG_ZYNQ_QSPI=y CONFIG_ZYNQ_QSPI=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_USB_GADGET=y CONFIG_USB_GADGET=y
CONFIG_USB_ULPI=y
CONFIG_USB_ULPI_VIEWPORT=y
...@@ -23,3 +23,5 @@ CONFIG_ZYNQ_GEM=y ...@@ -23,3 +23,5 @@ CONFIG_ZYNQ_GEM=y
CONFIG_ZYNQ_QSPI=y CONFIG_ZYNQ_QSPI=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_USB_GADGET=y CONFIG_USB_GADGET=y
CONFIG_USB_ULPI=y
CONFIG_USB_ULPI_VIEWPORT=y
...@@ -24,3 +24,5 @@ CONFIG_DEBUG_UART_CLOCK=50000000 ...@@ -24,3 +24,5 @@ CONFIG_DEBUG_UART_CLOCK=50000000
CONFIG_ZYNQ_QSPI=y CONFIG_ZYNQ_QSPI=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_USB_GADGET=y CONFIG_USB_GADGET=y
CONFIG_USB_ULPI=y
CONFIG_USB_ULPI_VIEWPORT=y
...@@ -36,8 +36,7 @@ ...@@ -36,8 +36,7 @@
/* USB host support */ /* USB host support */
#define CONFIG_USB_EHCI #define CONFIG_USB_EHCI
#define CONFIG_USB_EHCI_TEGRA #define CONFIG_USB_EHCI_TEGRA
#define CONFIG_USB_ULPI #define CONFIG_USB_MAX_CONTROLLER_COUNT 3
#define CONFIG_USB_ULPI_VIEWPORT
#define CONFIG_USB_STORAGE #define CONFIG_USB_STORAGE
#define CONFIG_CMD_USB #define CONFIG_CMD_USB
......
...@@ -44,8 +44,6 @@ ...@@ -44,8 +44,6 @@
/* USB Host support */ /* USB Host support */
#define CONFIG_USB_EHCI #define CONFIG_USB_EHCI
#define CONFIG_USB_EHCI_TEGRA #define CONFIG_USB_EHCI_TEGRA
#define CONFIG_USB_ULPI
#define CONFIG_USB_ULPI_VIEWPORT
#define CONFIG_USB_STORAGE #define CONFIG_USB_STORAGE
#define CONFIG_CMD_USB #define CONFIG_CMD_USB
......
...@@ -102,8 +102,6 @@ ...@@ -102,8 +102,6 @@
#define CONFIG_OMAP3_GPIO_5 #define CONFIG_OMAP3_GPIO_5
#define CONFIG_USB_EHCI #define CONFIG_USB_EHCI
#define CONFIG_USB_EHCI_OMAP #define CONFIG_USB_EHCI_OMAP
#define CONFIG_USB_ULPI
#define CONFIG_USB_ULPI_VIEWPORT_OMAP
#define CONFIG_OMAP_EHCI_PHY1_RESET_GPIO 57 #define CONFIG_OMAP_EHCI_PHY1_RESET_GPIO 57
#define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3 #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3
#define CONFIG_USB_HOST_ETHER #define CONFIG_USB_HOST_ETHER
......
...@@ -91,8 +91,6 @@ ...@@ -91,8 +91,6 @@
#define CONFIG_OMAP3_GPIO_5 #define CONFIG_OMAP3_GPIO_5
#define CONFIG_USB_EHCI #define CONFIG_USB_EHCI
#define CONFIG_USB_EHCI_OMAP #define CONFIG_USB_EHCI_OMAP
#define CONFIG_USB_ULPI
#define CONFIG_USB_ULPI_VIEWPORT_OMAP
#define CONFIG_OMAP_EHCI_PHY1_RESET_GPIO 25 #define CONFIG_OMAP_EHCI_PHY1_RESET_GPIO 25
#define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3 #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3
#define CONFIG_USB_STORAGE #define CONFIG_USB_STORAGE
......
...@@ -96,8 +96,6 @@ ...@@ -96,8 +96,6 @@
# define CONFIG_CMD_USB # define CONFIG_CMD_USB
# define CONFIG_USB_STORAGE # define CONFIG_USB_STORAGE
# define CONFIG_USB_EHCI_ZYNQ # define CONFIG_USB_EHCI_ZYNQ
# define CONFIG_USB_ULPI_VIEWPORT
# define CONFIG_USB_ULPI
# define CONFIG_EHCI_IS_TDI # define CONFIG_EHCI_IS_TDI
# define CONFIG_USB_MAX_CONTROLLER_COUNT 2 # define CONFIG_USB_MAX_CONTROLLER_COUNT 2
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment