summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorMateusz Kulikowski <mateusz.kulikowski@gmail.com>2016-03-31 23:12:19 +0200
committerTom Rini <trini@konsulko.com>2016-04-01 17:18:09 -0400
commit5493a32c8ee9b54d2eb39c374ddadb7a34143c81 (patch)
tree1346b0270cf61a82e958bbd6fa566d5764e06447 /include
parent6b14fbbdc6b1a6669bc70212bfe6d1d7129e03b4 (diff)
downloadu-boot-imx-5493a32c8ee9b54d2eb39c374ddadb7a34143c81.zip
u-boot-imx-5493a32c8ee9b54d2eb39c374ddadb7a34143c81.tar.gz
u-boot-imx-5493a32c8ee9b54d2eb39c374ddadb7a34143c81.tar.bz2
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>
Diffstat (limited to 'include')
-rw-r--r--include/configs/colibri_t20.h3
-rw-r--r--include/configs/harmony.h2
-rw-r--r--include/configs/mcx.h2
-rw-r--r--include/configs/tam3517-common.h2
-rw-r--r--include/configs/zynq-common.h2
5 files changed, 1 insertions, 10 deletions
diff --git a/include/configs/colibri_t20.h b/include/configs/colibri_t20.h
index b7ad189..e97e5a1 100644
--- 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 f66ac70..0a3cb18 100644
--- 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 174cb5c..9a4f638 100644
--- 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 a532417..59b6c5f 100644
--- 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 9ff3df2..c2ed28a 100644
--- 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