usb: Fix bug when both DFU & ETHER are defined

PATCH New Pantelis Antoniou 2 participants 2 messages Dec 3, 2012 USB

lore

Share & tools

lore

Pantelis Antoniou

author

2012-12-03 10:10 UTC #0 lore raw

PATCH 1/1 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 <[email protected]>

---
 drivers/usb/gadget/Makefile | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

drivers/usb/gadget/Makefile +8 -2

index 040eaba..e545b6b 100644
@@ -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

Signature · 1 line

1.7.12

Marek Vasut

Applied

2012-12-03 14:54 UTC #1 lore raw

PATCH 1/1 usb: Fix bug when both DFU & ETHER are defined

Dear Pantelis Antoniou,

Quoted 8 lines

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 <[email protected]>

[...]

Applied, thanks

Best regards,
Marek Vasut