USB-CDC: Restuct USB gadget Makefile
Prohibit simultaneous usage of both old and new gadget stacks and allow UDC drivers to be dependent on CONFIG_USB_ETHER. Signed-off-by: Vitaly Kuzmichev <vkuzmichev@mvista.com>
This commit is contained in:
parent
23cd138503
commit
7b2f390611
|
@ -25,6 +25,10 @@ include $(TOPDIR)/config.mk
|
||||||
|
|
||||||
LIB := $(obj)libusb_gadget.a
|
LIB := $(obj)libusb_gadget.a
|
||||||
|
|
||||||
|
# new USB gadget layer dependencies
|
||||||
|
ifdef CONFIG_USB_ETHER
|
||||||
|
COBJS-y += ether.o epautoconf.o config.o usbstring.o
|
||||||
|
else
|
||||||
# Devices not related to the new gadget layer depend on CONFIG_USB_DEVICE
|
# Devices not related to the new gadget layer depend on CONFIG_USB_DEVICE
|
||||||
ifdef CONFIG_USB_DEVICE
|
ifdef CONFIG_USB_DEVICE
|
||||||
COBJS-y += core.o
|
COBJS-y += core.o
|
||||||
|
@ -35,8 +39,7 @@ COBJS-$(CONFIG_MPC885_FAMILY) += mpc8xx_udc.o
|
||||||
COBJS-$(CONFIG_PXA27X) += pxa27x_udc.o
|
COBJS-$(CONFIG_PXA27X) += pxa27x_udc.o
|
||||||
COBJS-$(CONFIG_SPEARUDC) += spr_udc.o
|
COBJS-$(CONFIG_SPEARUDC) += spr_udc.o
|
||||||
endif
|
endif
|
||||||
# new USB gadget layer dependencies
|
endif
|
||||||
COBJS-$(CONFIG_USB_ETHER) += ether.o epautoconf.o config.o usbstring.o
|
|
||||||
|
|
||||||
COBJS := $(COBJS-y)
|
COBJS := $(COBJS-y)
|
||||||
SRCS := $(COBJS:.o=.c)
|
SRCS := $(COBJS:.o=.c)
|
||||||
|
|
Loading…
Reference in New Issue