Merge https://gitlab.denx.de/u-boot/custodians/u-boot-spi

[oweals/u-boot.git] / drivers / usb / Kconfig

diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig
index 3b53bf2c58a1e9f0197d4f8db38e467393351e46..756a4ec402e7ee1b3b0b369cee82bd51c310c807 100644 (file)
--- a/drivers/usb/Kconfig
+++ b/drivers/usb/Kconfig
@@ -39,8 +39,8 @@ config DM_USB
        help
          Enable driver model for USB. The USB interface is then implemented
          by the USB uclass. Multiple USB controllers of different types
-         (XHCI, EHCI) can be attached and used. The 'usb' command works as
-         normal. OCHI is not supported at present.
+         (XHCI, EHCI, OHCI) can be attached and used. The 'usb' command works
+         as normal.
 
          Much of the code is shared but with this option enabled the USB
          uclass takes care of device enumeration. USB devices can be
@@ -68,6 +68,8 @@ config SPL_DM_USB_GADGET
 
 source "drivers/usb/host/Kconfig"
 
+source "drivers/usb/cdns3/Kconfig"
+
 source "drivers/usb/dwc3/Kconfig"
 
 source "drivers/usb/musb/Kconfig"
@@ -98,8 +100,15 @@ config USB_KEYBOARD
 
 if USB_KEYBOARD
 
+config USB_KEYBOARD_FN_KEYS
+       bool "USB keyboard function key support"
+       help
+         Say Y here if you want support for keys F1 - F12, INS, HOME, DELETE,
+         END, PAGE UP, and PAGE DOWN.
+
 choice
        prompt "USB keyboard polling"
+       default SYS_USB_EVENT_POLL_VIA_INT_QUEUE if ARCH_SUNXI
        default SYS_USB_EVENT_POLL
        ---help---
          Enable a polling mechanism for USB keyboard.