diff options
| author | Pantelis Antoniou <panto@antoniou-consulting.com> | 2012-12-03 00:10:28 +0000 |
|---|---|---|
| committer | Marek Vasut <marex@denx.de> | 2013-03-16 21:12:02 +0100 |
| commit | a04983d6a953675f2eebaf60f75fbd385fd21678 (patch) | |
| tree | a25a6832d151a3f3eb6478388d05d97b629e0ffd /drivers | |
| parent | 1b6ca18b4244756d4dbd4240510f4cc448ade0bc (diff) | |
| download | talos-obmc-uboot-a04983d6a953675f2eebaf60f75fbd385fd21678.tar.gz talos-obmc-uboot-a04983d6a953675f2eebaf60f75fbd385fd21678.zip | |
usb: Fix bug when both DFU & ETHER are defined
When both CONFIG_USB_GADGET & CONFIG_USB_ETHER are defined
the makefile links objects twice.
This patch uses a Makefile specific idiom of
'if defined(CONFIG_USB_GADGET) || defined(CONFIG_USB_ETHER)'
to handle the case.
Signed-off-by: Pantelis Antoniou <panto@antoniou-consulting.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/usb/gadget/Makefile | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/usb/gadget/Makefile b/drivers/usb/gadget/Makefile index 040eaba3bc..e545b6be6b 100644 --- a/drivers/usb/gadget/Makefile +++ b/drivers/usb/gadget/Makefile @@ -25,15 +25,21 @@ include $(TOPDIR)/config.mk LIB := $(obj)libusb_gadget.o +# if defined(CONFIG_USB_GADGET) || defined(CONFIG_USB_ETHER) +# Everytime you forget how crufty makefiles can get things like +# this remind you... +ifneq (,$(CONFIG_USB_GADGET)$(CONFIG_USB_ETHER)) +COBJS-y += epautoconf.o config.o usbstring.o +endif + # new USB gadget layer dependencies ifdef CONFIG_USB_GADGET -COBJS-y += epautoconf.o config.o usbstring.o COBJS-$(CONFIG_USB_GADGET_S3C_UDC_OTG) += s3c_udc_otg.o COBJS-$(CONFIG_USBDOWNLOAD_GADGET) += g_dnl.o COBJS-$(CONFIG_DFU_FUNCTION) += f_dfu.o endif ifdef CONFIG_USB_ETHER -COBJS-y += ether.o epautoconf.o config.o usbstring.o +COBJS-y += ether.o COBJS-$(CONFIG_USB_ETH_RNDIS) += rndis.o COBJS-$(CONFIG_MV_UDC) += mv_udc.o COBJS-$(CONFIG_CPU_PXA25X) += pxa25x_udc.o |
