Patchwork [U-Boot] usb: Fix bug when both DFU & ETHER are defined

login
register
mail settings
Submitter Pantelis Antoniou
Date Dec. 3, 2012, 10:10 a.m.
Message ID <1354529428-27477-1-git-send-email-panto@antoniou-consulting.com>
Download mbox | patch
Permalink /patch/203306/
State Awaiting Upstream
Delegated to: Marek Vasut
Headers show

Comments

Pantelis Antoniou - Dec. 3, 2012, 10:10 a.m.
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>
---
 drivers/usb/gadget/Makefile | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
Marek Vasut - Dec. 3, 2012, 2:54 p.m.
Dear Pantelis Antoniou,

> 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>
[...]

Applied, thanks

Best regards,
Marek Vasut

Patch

diff --git a/drivers/usb/gadget/Makefile b/drivers/usb/gadget/Makefile
index 040eaba..e545b6b 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