usb: dwc3: Makefile: Make dwc3 driver compile in u-boot

Now that the entire dwc3 driver is adapted to compile with uboot build,
modify the Makefiles so that the dwc3 driver can be built.

Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
Reviewed-by: Lukasz Majewski <l.majewski@samsung.com>
Conflicts:
	Makefile

diff --git a/Makefile b/Makefile
index ff8c5ecc0b16d842a39fdd926918c178594f72b7..604a14d1e475b9185169bc6b34b3a1f1f3e32a84 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -301,12 +301,14 @@ LIBS += arch/powerpc/cpu/mpc8xxx/lib8xxx.o
 endif
 LIBS += drivers/rtc/librtc.o
 LIBS += drivers/serial/libserial.o
+LIBS += drivers/usb/dwc3/
 ifeq ($(CONFIG_GENERIC_LPC_TPM),y)
 LIBS += drivers/tpm/libtpm.o
 endif
 LIBS += drivers/twserial/libtws.o
 LIBS += drivers/usb/eth/libusb_eth.o
 LIBS += drivers/usb/gadget/libusb_gadget.o
+LIBS += drivers/usb/gadget/udc/
 LIBS += drivers/usb/host/libusb_host.o
 LIBS += drivers/usb/musb/libusb_musb.o
 LIBS += drivers/usb/phy/libusb_phy.o

diff --git a/drivers/usb/dwc3/Makefile b/drivers/usb/dwc3/Makefile
index afaa767718e5017bb16a55dfc283209687f527ad..e455a5279c2b71c3859cb49c90bf9f2b6e326ced 100644 (file)
--- a/drivers/usb/dwc3/Makefile
+++ b/drivers/usb/dwc3/Makefile
@@ -1,37 +1,8 @@
-ccflags-$(CONFIG_USB_DWC3_DEBUG)       := -DDEBUG
-ccflags-$(CONFIG_USB_DWC3_VERBOSE)     += -DVERBOSE_DEBUG
-
 obj-$(CONFIG_USB_DWC3)                 += dwc3.o
 
-dwc3-y                                 := core.o debug.o
-
-ifneq ($(filter y,$(CONFIG_USB_DWC3_HOST) $(CONFIG_USB_DWC3_DUAL_ROLE)),)
-       dwc3-y                          += host.o
-endif
-
-ifneq ($(filter y,$(CONFIG_USB_DWC3_GADGET) $(CONFIG_USB_DWC3_DUAL_ROLE)),)
-       dwc3-y                          += gadget.o ep0.o
-endif
-
-ifneq ($(CONFIG_DEBUG_FS),)
-       dwc3-y                          += debugfs.o
-endif
+dwc3-y                                 := core.o
 
-##
-# Platform-specific glue layers go here
-#
-# NOTICE: Make sure your glue layer doesn't depend on anything
-# which is arch-specific and that it compiles on all situations.
-#
-# We want to keep this requirement in order to be able to compile
-# the entire driver (with all its glue layers) on several architectures
-# and make sure it compiles fine. This will also help with allmodconfig
-# and allyesconfig builds.
-##
+dwc3-y                                 += gadget.o ep0.o
 
 obj-$(CONFIG_USB_DWC3_OMAP)            += dwc3-omap.o
-obj-$(CONFIG_USB_DWC3_EXYNOS)          += dwc3-exynos.o
-obj-$(CONFIG_USB_DWC3_PCI)             += dwc3-pci.o
-obj-$(CONFIG_USB_DWC3_KEYSTONE)                += dwc3-keystone.o
-obj-$(CONFIG_USB_DWC3_QCOM)            += dwc3-qcom.o
-obj-$(CONFIG_USB_DWC3_ST)              += dwc3-st.o
+obj-$(CONFIG_USB_DWC3_PHY_OMAP)                += ti_usb_phy.o

diff --git a/drivers/usb/gadget/udc/Makefile b/drivers/usb/gadget/udc/Makefile
index be265aa0a2630e13a47407244193d6df87fb8851..12380f4e4e91fb22f3f6ddbde029fa4871f8353c 100644 (file)
--- a/drivers/usb/gadget/udc/Makefile
+++ b/drivers/usb/gadget/udc/Makefile
@@ -1,4 +1,4 @@
 #
 # USB peripheral controller drivers
 #
-obj-$(CONFIG_USB_GADGET)       += udc-core.o
+obj-$(CONFIG_USB_DWC3_GADGET)  += udc-core.o