summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Agner <stefan.agner@toradex.com>2016-07-13 00:25:36 -0700
committerStefano Babic <sbabic@denx.de>2016-07-19 19:52:14 +0200
commit2deebe2481c4a193c3c02e0a56b0b43039bcecb7 (patch)
treeb165327d9327271efdc1f1187858a7a407157e19
parent83fd908f28ca94baf095ba64b4b8a116dd473cb7 (diff)
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>
-rw-r--r--configs/mx7dsabresd_defconfig1
-rw-r--r--configs/warp7_defconfig2
-rw-r--r--drivers/usb/host/Kconfig7
-rw-r--r--include/configs/mx7dsabresd.h2
-rw-r--r--include/configs/warp7.h2
5 files changed, 10 insertions, 4 deletions
diff --git a/configs/mx7dsabresd_defconfig b/configs/mx7dsabresd_defconfig
index 09716a7f51..9dbc9c7298 100644
--- 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 ad4fbbf606..bd9b5bb2ea 100644
--- 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 89580cc31f..7992cb4632 100644
--- 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 ece8a03f11..cfaf59bbe9 100644
--- 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 fc0e51a9ae..af39817b23 100644
--- 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