summaryrefslogtreecommitdiff
path: root/drivers/usb
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2015-08-02 07:40:37 -0400
committerTom Rini <trini@konsulko.com>2015-08-02 07:40:37 -0400
commit7a1af7a79bd79ded6a78d0c1afdbc3353669e313 (patch)
tree6adcb6dfb2782e8502ca07e2533bee3f95eaeae9 /drivers/usb
parent8968b914be7bfd67d179d0395898bd9db67aaad1 (diff)
parentf85764cc1f6ab01ffc60dd78de9c4de4cff2b5ce (diff)
downloadu-boot-imx-7a1af7a79bd79ded6a78d0c1afdbc3353669e313.zip
u-boot-imx-7a1af7a79bd79ded6a78d0c1afdbc3353669e313.tar.gz
u-boot-imx-7a1af7a79bd79ded6a78d0c1afdbc3353669e313.tar.bz2
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/Kconfig29
-rw-r--r--drivers/usb/host/Kconfig7
2 files changed, 36 insertions, 0 deletions
diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig
index 3fa5b2e..716dad4 100644
--- a/drivers/usb/Kconfig
+++ b/drivers/usb/Kconfig
@@ -1,3 +1,4 @@
+menu USB
config USB_ARCH_HAS_HCD
def_bool y
@@ -59,4 +60,32 @@ config USB_STORAGE
Say Y here if you want to connect USB mass storage devices to your
board's USB port.
+config USB_KEYBOARD
+ bool "USB Keyboard support"
+ ---help---
+ Say Y here if you want to use a USB keyboard for U-Boot command line
+ input.
+
+if USB_KEYBOARD
+
+choice
+ prompt "USB keyboard polling"
+ optional
+ ---help---
+ Enable a polling mechanism for USB keyboard.
+
+ config SYS_USB_EVENT_POLL
+ bool "Interrupt polling"
+
+ config SYS_USB_EVENT_POLL_VIA_INT_QUEUE
+ bool "Poll via interrupt queue"
+
+ config SYS_USB_EVENT_POLL_VIA_CONTROL_EP
+ bool "Poll via control EP"
+
+endchoice
+
+endif
+
endif
+endmenu
diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index 8705c7c..b30b43d 100644
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@ -52,6 +52,13 @@ config USB_EHCI
if USB_EHCI_HCD
+config USB_EHCI_MX6
+ bool "Support for i.MX6 on-chip EHCI USB controller"
+ depends on ARCH_MX6
+ default y
+ ---help---
+ Enables support for the on-chip EHCI controller on i.MX6 SoCs.
+
config USB_EHCI_UNIPHIER
bool "Support for UniPhier on-chip EHCI USB controller"
depends on ARCH_UNIPHIER && OF_CONTROL