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 03746dd12fc9b3bd981458b8695ac728c98e72c3..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
@@ -49,11 +49,27 @@ config DM_USB
 
 config SPL_DM_USB
        bool "Enable driver model for USB in SPL"
-       depends on DM_USB
+       depends on SPL_DM && DM_USB
        default y
 
+config DM_USB_GADGET
+       bool "Enable driver model for USB Gadget"
+       depends on DM_USB
+       help
+         Enable driver model for USB Gadget (Peripheral
+         mode)
+
+config SPL_DM_USB_GADGET
+       bool "Enable driver model for USB Gadget in sPL"
+       depends on SPL_DM_USB
+       help
+         Enable driver model for USB Gadget in SPL
+         (Peripheral mode)
+
 source "drivers/usb/host/Kconfig"
 
+source "drivers/usb/cdns3/Kconfig"
+
 source "drivers/usb/dwc3/Kconfig"
 
 source "drivers/usb/musb/Kconfig"
@@ -70,6 +86,7 @@ comment "USB peripherals"
 
 config USB_STORAGE
        bool "USB Mass Storage support"
+       depends on !(BLK && !DM_USB)
        ---help---
          Say Y here if you want to connect USB mass storage devices to your
          board's USB port.
@@ -83,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.