Kconfig: OMAP: USB: Migrate CONFIG_USB_EHCI_OMAP to Kconfig

Follow the exiting logic for the i.MX options when migrating this option. Cc: Marek Vasut <marex@denx.de> Signed-off-by: Tom Rini <trini@konsulko.com> Reviewed-by: Marek Vasut <marex@denx.de>
7 years ago · 1d1ab61c32
parent 80f1f3204a
commit 1d1ab61c32
15 changed files with 9 additions and 13 deletions
--- a/configs/eco5pk_defconfig
+++ b/configs/eco5pk_defconfig
@ -25,5 +25,6 @@ CONFIG_MMC_OMAP_HS=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
+# CONFIG_USB_EHCI_OMAP is not set
 CONFIG_USB_STORAGE=y
 CONFIG_OF_LIBFDT=y
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@ -105,6 +105,14 @@ config USB_EHCI_MX7
 	---help---
 	  Enables support for the on-chip EHCI controller on i.MX7 SoCs.

+config USB_EHCI_OMAP
+	bool "Support for OMAP3+ on-chip EHCI USB controller"
+	depends on ARCH_OMAP2PLUS
+	default y
+	---help---
+	  Enables support for the on-chip EHCI controller on OMAP3 and later
+	  SoCs.
+
 if USB_EHCI_MX7

 config MXC_USB_OTG_HACTIVE
--- a/include/configs/cm_t35.h
+++ b/include/configs/cm_t35.h
@ -75,7 +75,6 @@

 /* USB */
 #define CONFIG_USB_OMAP3
-#define CONFIG_USB_EHCI_OMAP
 #define CONFIG_USB_MUSB_UDC
 #define CONFIG_TWL4030_USB

--- a/include/configs/cm_t3517.h
+++ b/include/configs/cm_t3517.h
@ -84,7 +84,6 @@

 #ifndef CONFIG_USB_MUSB_AM35X
 #define CONFIG_USB_OMAP3
-#define CONFIG_USB_EHCI_OMAP
 #define CONFIG_OMAP_EHCI_PHY1_RESET_GPIO 146
 #define CONFIG_OMAP_EHCI_PHY2_RESET_GPIO 147
 #else /* !CONFIG_USB_MUSB_AM35X */
--- a/include/configs/cm_t54.h
+++ b/include/configs/cm_t54.h
@ -58,7 +58,6 @@
 #define CONFIG_SYS_SCSI_MAX_DEVICE	(CONFIG_SYS_SCSI_MAX_SCSI_ID * \
 						CONFIG_SYS_SCSI_MAX_LUN)
 /* USB UHH support options */
-#define CONFIG_USB_EHCI_OMAP
 #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS	3
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET

--- a/include/configs/duovero.h
+++ b/include/configs/duovero.h
@ -25,7 +25,6 @@
 #define CONFIG_SYS_DEFAULT_LPDDR2_TIMINGS

 /* USB UHH support options */
-#define CONFIG_USB_EHCI_OMAP
 #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3

 #define CONFIG_OMAP_EHCI_PHY1_RESET_GPIO 1
--- a/include/configs/eco5pk.h
+++ b/include/configs/eco5pk.h
@ -15,7 +15,6 @@

 #include "tam3517-common.h"

-#undef CONFIG_USB_EHCI_OMAP
 #undef CONFIG_USB_OMAP3

 /* Our console port is port3 */
--- a/include/configs/mcx.h
+++ b/include/configs/mcx.h
@ -73,7 +73,6 @@
 					115200}

 /* EHCI */
-#define CONFIG_USB_EHCI_OMAP
 #define CONFIG_OMAP_EHCI_PHY1_RESET_GPIO	57
 #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3
 #define	CONFIG_USB_HOST_ETHER
--- a/include/configs/omap3_beagle.h
+++ b/include/configs/omap3_beagle.h
@ -56,7 +56,6 @@

 /* USB EHCI */

-#define CONFIG_USB_EHCI_OMAP
 #define CONFIG_OMAP_EHCI_PHY1_RESET_GPIO	147

 #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3
--- a/include/configs/omap3_overo.h
+++ b/include/configs/omap3_overo.h
@ -40,7 +40,6 @@
 #define CONFIG_TWL4030_LED

 /* USB EHCI */
-#define CONFIG_USB_EHCI_OMAP
 #define CONFIG_OMAP_EHCI_PHY1_RESET_GPIO	183
 #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS	3

--- a/include/configs/omap4_panda.h
+++ b/include/configs/omap4_panda.h
@ -17,7 +17,6 @@
 */

 /* USB UHH support options */
-#define CONFIG_USB_EHCI_OMAP
 #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3

 #define CONFIG_OMAP_EHCI_PHY1_RESET_GPIO 1
--- a/include/configs/omap5_uevm.h
+++ b/include/configs/omap5_uevm.h
@ -52,7 +52,6 @@
 #define CONFIG_SYS_I2C_TCA642X_ADDR 0x22

 /* USB UHH support options */
-#define CONFIG_USB_EHCI_OMAP
 #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET

--- a/include/configs/tam3517-common.h
+++ b/include/configs/tam3517-common.h
@ -66,7 +66,6 @@
 #define CONFIG_SYS_BAUDRATE_TABLE	{4800, 9600, 19200, 38400, 57600,\
 					115200}
 /* EHCI */
-#define CONFIG_USB_EHCI_OMAP
 #define CONFIG_OMAP_EHCI_PHY1_RESET_GPIO	25
 #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3

--- a/include/configs/tao3530.h
+++ b/include/configs/tao3530.h
@ -228,7 +228,6 @@
 */

 /* USB EHCI */
-#define CONFIG_USB_EHCI_OMAP
 #define CONFIG_OMAP_EHCI_PHY1_RESET_GPIO	162

 #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@ -6285,7 +6285,6 @@ CONFIG_USB_EHCI_KIRKWOOD
 CONFIG_USB_EHCI_MX5
 CONFIG_USB_EHCI_MXC
 CONFIG_USB_EHCI_MXS
-CONFIG_USB_EHCI_OMAP
 CONFIG_USB_EHCI_PCI
 CONFIG_USB_EHCI_PPC4XX
 CONFIG_USB_EHCI_RMOBILE