From mboxrd@z Thu Jan  1 00:00:00 1970
From: Marek Vasut <marex@denx.de>
Date: Wed, 28 Nov 2012 03:43:51 +0100
Subject: [U-Boot] [PATCH 2/9] Fix bug when both DFU & ETHER are defined
In-Reply-To: <1354106642-4587-3-git-send-email-panto@antoniou-consulting.com>
References: <1354106642-4587-1-git-send-email-panto@antoniou-consulting.com>
	<1354106642-4587-3-git-send-email-panto@antoniou-consulting.com>
Message-ID: <201211280343.52011.marex@denx.de>
List-Id: <u-boot.lists.denx.de>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: u-boot@lists.denx.de

Dear Pantelis Antoniou,

> When both CONFIG_USB_GADGET & CONFIG_USB_ETHER are defined
> the makefile links objects twice.
> 
> Detect this and fix it with a not very elegant way in the
> makefile. Revisit and clean it later.
> 
> Signed-off-by: Pantelis Antoniou <panto@antoniou-consulting.com>
> ---
>  drivers/usb/gadget/Makefile | 13 +++++++++++--
>  1 file changed, 11 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/usb/gadget/Makefile b/drivers/usb/gadget/Makefile
> index 040eaba..15206cd 100644
> --- a/drivers/usb/gadget/Makefile
> +++ b/drivers/usb/gadget/Makefile
> @@ -26,14 +26,23 @@ include $(TOPDIR)/config.mk
>  LIB	:= $(obj)libusb_gadget.o
> 
>  # new USB gadget layer dependencies
> +
> +# ugh; ugh; ugh common objects included twice
> +ifdef CONFIG_USB_GADGET
> +   COBJS-y += epautoconf.o config.o usbstring.o
> +else
> +  ifdef CONFIG_USB_ETHER
> +     COBJS-y += epautoconf.o config.o usbstring.o
> +  endif
> +endif

COBJS-$(CONFIG_ST) += st.o
COBJS-$(CONFIG_ST_ELSE) += st_else.o

if (both selected)
 scream and die.

> +
>  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

Best regards,
Marek Vasut