Common USB code is built whenever USB is enabled (in non-SPL builds). The USB uclass is built whenever (SPL_)DM_USB is enabled. Both need to be independent from CMD_USB.
Signed-off-by: Sven Schwermer sven@svenschwermer.de --- common/Makefile | 2 +- drivers/usb/host/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/common/Makefile b/common/Makefile index a2388364d9..7d88077930 100644 --- a/common/Makefile +++ b/common/Makefile @@ -33,7 +33,7 @@ obj-$(CONFIG_MII) += miiphyutil.o obj-$(CONFIG_CMD_MII) += miiphyutil.o obj-$(CONFIG_PHYLIB) += miiphyutil.o
-ifdef CONFIG_CMD_USB +ifdef CONFIG_USB obj-y += usb.o usb_hub.o obj-$(CONFIG_USB_STORAGE) += usb_storage.o endif diff --git a/drivers/usb/host/Makefile b/drivers/usb/host/Makefile index bfa565c4c3..285c20ae86 100644 --- a/drivers/usb/host/Makefile +++ b/drivers/usb/host/Makefile @@ -4,7 +4,7 @@ # Wolfgang Denk, DENX Software Engineering, wd@denx.de.
ifdef CONFIG_$(SPL_)DM_USB -obj-$(CONFIG_CMD_USB) += usb-uclass.o +obj-y += usb-uclass.o obj-$(CONFIG_SANDBOX) += usb-sandbox.o endif