diff options
author | Tom Rini <trini@konsulko.com> | 2021-06-30 20:09:49 +0300 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2021-06-30 20:10:02 +0300 |
commit | b7ad721c83fdbeeb71189d5f259c109cb1c38895 (patch) | |
tree | 73a4d5a38a19c321a867ae6466dc6b5c689bada7 | |
parent | 4e1903a645453deab5ec5dd1cf4f0061469b99c3 (diff) | |
download | u-boot-b7ad721c83fdbeeb71189d5f259c109cb1c38895.tar.xz |
Revert "TEST: USB_HOST not USB"
This reverts commit 4e1903a645453deab5ec5dd1cf4f0061469b99c3.
This local commit was not intended to be pushed out.
Signed-off-by: Tom Rini <trini@konsulko.com>
-rw-r--r-- | Makefile | 4 | ||||
-rw-r--r-- | cmd/Kconfig | 2 |
2 files changed, 3 insertions, 3 deletions
@@ -824,7 +824,7 @@ libs-y += drivers/usb/eth/ libs-$(CONFIG_USB_DEVICE) += drivers/usb/gadget/ libs-$(CONFIG_USB_GADGET) += drivers/usb/gadget/ libs-$(CONFIG_USB_GADGET) += drivers/usb/gadget/udc/ -libs-$(CONFIG_USB_HOST) += drivers/usb/host/ +libs-y += drivers/usb/host/ libs-y += drivers/usb/mtu3/ libs-y += drivers/usb/musb/ libs-y += drivers/usb/musb-new/ @@ -1115,7 +1115,7 @@ ifneq ($(CONFIG_DM),y) @echo >&2 "====================================================" endif $(call deprecated,CONFIG_DM_USB CONFIG_OF_CONTROL CONFIG_BLK,\ - USB_HOST,v2019.07,$(CONFIG_USB_HOST)) + USB,v2019.07,$(CONFIG_USB)) $(call deprecated,CONFIG_DM_PCI,PCI,v2019.07,$(CONFIG_PCI)) $(call deprecated,CONFIG_DM_VIDEO,video,v2019.07,\ $(CONFIG_LCD)$(CONFIG_VIDEO)) diff --git a/cmd/Kconfig b/cmd/Kconfig index a13a68f8f3..a9fb4eead2 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -1322,7 +1322,7 @@ config CMD_UNIVERSE config CMD_USB bool "usb" - depends on USB_HOST + depends on USB select HAVE_BLOCK_DEVICE help USB support. |