usb: move CONFIG_USB_EHCI_MX7 to Kconfig

Create an entry for "config USB_EHCI_MX7" in Kconfig and
switch over to it for all boards.

Signed-off-by: Stefan Agner <stefan.agner@toradex.com>

diff --git a/configs/mx7dsabresd_defconfig b/configs/mx7dsabresd_defconfig
index 09716a7f515d303b1c01170033f1e325731c7683..9dbc9c7298c1dc7d1f4ba9da31bc038d77218969 100644 (file)
--- a/configs/mx7dsabresd_defconfig
+++ b/configs/mx7dsabresd_defconfig
@@ -29,6 +29,7 @@ CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_USB=y
+CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_GADGET=y
 CONFIG_CI_UDC=y
 CONFIG_USB_GADGET_DOWNLOAD=y

diff --git a/configs/warp7_defconfig b/configs/warp7_defconfig
index ad4fbbf60669fa5dfcbdcd8ab52e819032fd4d91..bd9b5bb2ea2660ff435b49ab48b36da1600f7d01 100644 (file)
--- a/configs/warp7_defconfig
+++ b/configs/warp7_defconfig
@@ -22,4 +22,6 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_EXT4=y
 CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
+CONFIG_USB=y
+CONFIG_USB_EHCI_HCD=y
 CONFIG_OF_LIBFDT=y

diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index 89580cc31f786b936096c0cc94cff0009b9f0623..7992cb4632cb6af3ee2a7387849f97a807179afe 100644 (file)
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@ -74,6 +74,13 @@ config USB_EHCI_MX6
        ---help---
          Enables support for the on-chip EHCI controller on i.MX6 SoCs.
 
+config USB_EHCI_MX7
+       bool "Support for i.MX7 on-chip EHCI USB controller"
+       depends on ARCH_MX7
+       default y
+       ---help---
+         Enables support for the on-chip EHCI controller on i.MX7 SoCs.
+
 config USB_EHCI_MSM
        bool "Support for Qualcomm on-chip EHCI USB controller"
        depends on DM_USB

diff --git a/include/configs/mx7dsabresd.h b/include/configs/mx7dsabresd.h
index ece8a03f119f7395cc61e921c8ebc3a3d2fcb815..cfaf59bbe93051fd9179d94c4ed56e2269ceedbf 100644 (file)
--- a/include/configs/mx7dsabresd.h
+++ b/include/configs/mx7dsabresd.h
@@ -237,8 +237,6 @@
 #define CONFIG_MMCROOT                 "/dev/mmcblk0p2"  /* USDHC1 */
 
 /* USB Configs */
-#define CONFIG_USB_EHCI
-#define CONFIG_USB_EHCI_MX7
 #define CONFIG_USB_STORAGE
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 #define CONFIG_USB_HOST_ETHER

diff --git a/include/configs/warp7.h b/include/configs/warp7.h
index fc0e51a9ae8614b98fa9d2bc69f1a26aa301504c..af39817b23ae1ebdf593753a9c2c24c4b3c0eae2 100644 (file)
--- a/include/configs/warp7.h
+++ b/include/configs/warp7.h
@@ -114,8 +114,6 @@
 #define CONFIG_MMCROOT                 "/dev/mmcblk2p2"
 
 /* USB Configs */
-#define CONFIG_USB_EHCI
-#define CONFIG_USB_EHCI_MX7
 #define CONFIG_USB_STORAGE
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET