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: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/configs/colibri_t20_defconfig b/configs/colibri_t20_defconfig
index c36967dea1dee2acc9fd8f758ae72310541ee25e..3813e9662fabf7ad4019882a72ce4039ba2f9362 100644 (file)
--- a/configs/colibri_t20_defconfig
+++ b/configs/colibri_t20_defconfig
@@ -21,4 +21,6 @@ CONFIG_DM_USB=y
 CONFIG_USB_GADGET=y
 CONFIG_DM_VIDEO=y
 CONFIG_VIDEO_TEGRA20=y
+CONFIG_USB_ULPI=y
+CONFIG_USB_ULPI_VIEWPORT=y
 CONFIG_USE_PRIVATE_LIBGCC=y

diff --git a/configs/harmony_defconfig b/configs/harmony_defconfig
index c150f6e9c70a131e96ea62f187862a3105049cc0..d4aafe990270102dad9b039957eb36adacf0091c 100644 (file)
--- a/configs/harmony_defconfig
+++ b/configs/harmony_defconfig
@@ -21,4 +21,6 @@ CONFIG_USB=y
 CONFIG_DM_USB=y
 CONFIG_DM_VIDEO=y
 CONFIG_VIDEO_TEGRA20=y
+CONFIG_USB_ULPI=y
+CONFIG_USB_ULPI_VIEWPORT=y
 CONFIG_USE_PRIVATE_LIBGCC=y

diff --git a/configs/mcx_defconfig b/configs/mcx_defconfig
index a25ffcfc78780630baaf9c020ed5f223f16994e6..9c9d51a2c7dc0b99f766c3805323020ae55cb929 100644 (file)
--- a/configs/mcx_defconfig
+++ b/configs/mcx_defconfig
@@ -12,3 +12,6 @@ CONFIG_CMD_GPIO=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_SYS_NS16550=y
 CONFIG_OF_LIBFDT=y
+CONFIG_USB=y
+CONFIG_USB_ULPI=y
+CONFIG_USB_ULPI_VIEWPORT_OMAP=y

diff --git a/configs/mt_ventoux_defconfig b/configs/mt_ventoux_defconfig
index c537440fd0f0128cafee6de87f906336de415b0f..45913d4e73942e2bf4ac96954a86bc77a4a98fb6 100644 (file)
--- a/configs/mt_ventoux_defconfig
+++ b/configs/mt_ventoux_defconfig
@@ -10,3 +10,6 @@ CONFIG_CMD_GPIO=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_SYS_NS16550=y
 CONFIG_OF_LIBFDT=y
+CONFIG_USB=y
+CONFIG_USB_ULPI=y
+CONFIG_USB_ULPI_VIEWPORT_OMAP=y

diff --git a/configs/twister_defconfig b/configs/twister_defconfig
index 06c98eb84c10384a69702e267202c8fce696c9cf..064cf91415fbcdc5eb1c1293de260167dd525fa1 100644 (file)
--- a/configs/twister_defconfig
+++ b/configs/twister_defconfig
@@ -10,3 +10,6 @@ CONFIG_CMD_GPIO=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_SYS_NS16550=y
 CONFIG_OF_LIBFDT=y
+CONFIG_USB=y
+CONFIG_USB_ULPI=y
+CONFIG_USB_ULPI_VIEWPORT_OMAP=y

diff --git a/configs/zynq_picozed_defconfig b/configs/zynq_picozed_defconfig
index 67e38e5c5d161781ddf6d2c95ccfacc3b4a80b89..c730f3c3f41384ee391877d06dcd0ce8a7e65bd7 100644 (file)
--- a/configs/zynq_picozed_defconfig
+++ b/configs/zynq_picozed_defconfig
@@ -14,3 +14,5 @@ CONFIG_ZYNQ_SDHCI=y
 CONFIG_ZYNQ_GEM=y
 CONFIG_USB=y
 CONFIG_USB_GADGET=y
+CONFIG_USB_ULPI=y
+CONFIG_USB_ULPI_VIEWPORT=y

diff --git a/configs/zynq_zc702_defconfig b/configs/zynq_zc702_defconfig
index d1740a751be8315473db558d56dd23ab545e648f..e8d28e4f61717372a69aa705cc6fd32c07cf6e32 100644 (file)
--- a/configs/zynq_zc702_defconfig
+++ b/configs/zynq_zc702_defconfig
@@ -26,3 +26,5 @@ CONFIG_DEBUG_UART_CLOCK=50000000
 CONFIG_ZYNQ_QSPI=y
 CONFIG_USB=y
 CONFIG_USB_GADGET=y
+CONFIG_USB_ULPI=y
+CONFIG_USB_ULPI_VIEWPORT=y

diff --git a/configs/zynq_zc706_defconfig b/configs/zynq_zc706_defconfig
index d3ae438e1ce87299dadbdddf89a1760195fe9730..d19108f8045f4d32c2308f16e95d1d9a3a788e68 100644 (file)
--- a/configs/zynq_zc706_defconfig
+++ b/configs/zynq_zc706_defconfig
@@ -23,3 +23,5 @@ CONFIG_ZYNQ_GEM=y
 CONFIG_ZYNQ_QSPI=y
 CONFIG_USB=y
 CONFIG_USB_GADGET=y
+CONFIG_USB_ULPI=y
+CONFIG_USB_ULPI_VIEWPORT=y

diff --git a/configs/zynq_zed_defconfig b/configs/zynq_zed_defconfig
index 9ad33ff5c9347d59e9e8ac65496e05b2554e8ee2..b13de1069e6f5b85eb01b4b599e3befa802bb33c 100644 (file)
--- a/configs/zynq_zed_defconfig
+++ b/configs/zynq_zed_defconfig
@@ -23,3 +23,5 @@ CONFIG_ZYNQ_GEM=y
 CONFIG_ZYNQ_QSPI=y
 CONFIG_USB=y
 CONFIG_USB_GADGET=y
+CONFIG_USB_ULPI=y
+CONFIG_USB_ULPI_VIEWPORT=y

diff --git a/configs/zynq_zybo_defconfig b/configs/zynq_zybo_defconfig
index 470c9cbb125258196bbb8cf5344c14bd0ea86cc8..4a59890ff33a5309dde4787cfec37be677f9c507 100644 (file)
--- a/configs/zynq_zybo_defconfig
+++ b/configs/zynq_zybo_defconfig
@@ -24,3 +24,5 @@ CONFIG_DEBUG_UART_CLOCK=50000000
 CONFIG_ZYNQ_QSPI=y
 CONFIG_USB=y
 CONFIG_USB_GADGET=y
+CONFIG_USB_ULPI=y
+CONFIG_USB_ULPI_VIEWPORT=y

diff --git a/include/configs/colibri_t20.h b/include/configs/colibri_t20.h
index b7ad189af32fad3bd3d35b84a908eec8d40c5a47..e97e5a10dc26a3ab6ece2bd1ab6b434551785ef1 100644 (file)
--- a/include/configs/colibri_t20.h
+++ b/include/configs/colibri_t20.h
@@ -36,8 +36,7 @@
 /* USB host support */
 #define CONFIG_USB_EHCI
 #define CONFIG_USB_EHCI_TEGRA
-#define CONFIG_USB_ULPI
-#define CONFIG_USB_ULPI_VIEWPORT
+#define CONFIG_USB_MAX_CONTROLLER_COUNT        3
 #define CONFIG_USB_STORAGE
 #define CONFIG_CMD_USB
 

diff --git a/include/configs/harmony.h b/include/configs/harmony.h
index f66ac7087e8775a0810d8781c953eecb91ef5b27..0a3cb18a2ec4eebfe3e6e5dd857de53847b8cc27 100644 (file)
--- a/include/configs/harmony.h
+++ b/include/configs/harmony.h
@@ -44,8 +44,6 @@
 /* USB Host support */
 #define CONFIG_USB_EHCI
 #define CONFIG_USB_EHCI_TEGRA
-#define CONFIG_USB_ULPI
-#define CONFIG_USB_ULPI_VIEWPORT
 #define CONFIG_USB_STORAGE
 #define CONFIG_CMD_USB
 

diff --git a/include/configs/mcx.h b/include/configs/mcx.h
index 174cb5c4da3e4be23838c8057fb6b248e8413789..9a4f638ca1610d15eb265a3a27f6f4874a8fc4e6 100644 (file)
--- a/include/configs/mcx.h
+++ b/include/configs/mcx.h
@@ -102,8 +102,6 @@
 #define CONFIG_OMAP3_GPIO_5
 #define CONFIG_USB_EHCI
 #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_SYS_USB_EHCI_MAX_ROOT_PORTS 3
 #define        CONFIG_USB_HOST_ETHER

diff --git a/include/configs/tam3517-common.h b/include/configs/tam3517-common.h
index a532417e170332201a58d644a9db6a7b5cf535b9..59b6c5fd0a0f78e085612036ca283116d4f76345 100644 (file)
--- a/include/configs/tam3517-common.h
+++ b/include/configs/tam3517-common.h
@@ -91,8 +91,6 @@
 #define CONFIG_OMAP3_GPIO_5
 #define CONFIG_USB_EHCI
 #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_SYS_USB_EHCI_MAX_ROOT_PORTS 3
 #define CONFIG_USB_STORAGE

diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h
index 9ff3df25f00b2d246cf8ba31ec1e59666a0cf62a..c2ed28af145884af4b3bb6e2fc0d4483c978506d 100644 (file)
--- a/include/configs/zynq-common.h
+++ b/include/configs/zynq-common.h
@@ -96,8 +96,6 @@
 # define CONFIG_CMD_USB
 # define CONFIG_USB_STORAGE
 # define CONFIG_USB_EHCI_ZYNQ
-# define CONFIG_USB_ULPI_VIEWPORT
-# define CONFIG_USB_ULPI
 # define CONFIG_EHCI_IS_TDI
 # define CONFIG_USB_MAX_CONTROLLER_COUNT       2