projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.denx.de/u-boot-spi
[platform/kernel/u-boot.git]
/
drivers
/
usb
/
Kconfig
diff --git
a/drivers/usb/Kconfig
b/drivers/usb/Kconfig
index
62126aa
..
d456beb
100644
(file)
--- a/
drivers/usb/Kconfig
+++ b/
drivers/usb/Kconfig
@@
-47,26
+47,37
@@
config DM_USB
declared with the U_BOOT_USB_DEVICE() macro and will be
automatically probed when found on the bus.
declared with the U_BOOT_USB_DEVICE() macro and will be
automatically probed when found on the bus.
+config SPL_DM_USB
+ bool "Enable driver model for USB in SPL"
+ depends on DM_USB
+ default y
+
source "drivers/usb/host/Kconfig"
source "drivers/usb/dwc3/Kconfig"
source "drivers/usb/host/Kconfig"
source "drivers/usb/dwc3/Kconfig"
+source "drivers/usb/musb/Kconfig"
+
source "drivers/usb/musb-new/Kconfig"
source "drivers/usb/emul/Kconfig"
source "drivers/usb/musb-new/Kconfig"
source "drivers/usb/emul/Kconfig"
+source "drivers/usb/phy/Kconfig"
+
source "drivers/usb/ulpi/Kconfig"
comment "USB peripherals"
config USB_STORAGE
bool "USB Mass Storage support"
source "drivers/usb/ulpi/Kconfig"
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.
config USB_KEYBOARD
bool "USB Keyboard support"
---help---
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"
+ select SYS_STDIO_DEREGISTER
---help---
Say Y here if you want to use a USB keyboard for U-Boot command line
input.
---help---
Say Y here if you want to use a USB keyboard for U-Boot command line
input.
@@
-75,7
+86,7
@@
if USB_KEYBOARD
choice
prompt "USB keyboard polling"
choice
prompt "USB keyboard polling"
- optional
+ default SYS_USB_EVENT_POLL
---help---
Enable a polling mechanism for USB keyboard.
---help---
Enable a polling mechanism for USB keyboard.