embedded: reintroduce missing emulated bus initialization for UL_USB1 board.

[lincan.git] / embedded / app / usbcan / Makefile.omk

diff --git a/embedded/app/usbcan/Makefile.omk b/embedded/app/usbcan/Makefile.omk
index 7f3e648683ef9ccfd9c11ef8fe7a00441fc19d5b..0beeb961eb6c79ce6fb9ed91dc951d43fd6269f7 100644 (file)
--- a/embedded/app/usbcan/Makefile.omk
+++ b/embedded/app/usbcan/Makefile.omk
@@ -11,6 +11,9 @@ ifeq ($(CONFIG_APP_USBCAN),y)
 default_CONFIG += MACH=$(MACH)
 #default_CONFIG += ULAN_ID=$(ULAN_ID)
 default_CONFIG += CONFIG_MISC_VECT=x
+default_CONFIG += CONFIG_OC_LINCAN_CARD_ul_usb1=x
+default_CONFIG += CONFIG_OC_LINCAN_CARD_can_lmc1=x
+
 
 LOCAL_CONFIG_H = local_config.h
 
@@ -19,14 +22,24 @@ INCLUDES += -I.
 #include_HEADERS  = ul_idstr.h
 
 bin_PROGRAMS = usbcan
-usbcan_SOURCES = main.c can.c can_queue.c sja1000p.c can_quesysless.c devcommon.c setup.c ul_usb1.c finish.c usb_vend.c
+usbcan_SOURCES = main.c can_queue.c sja1000p.c  devcommon.c setup.c finish.c
+usbcan_SOURCES += usb_vend.c can_quesysless.c sysdep_sysless.c
+ifeq ($(CONFIG_OC_LINCAN_CARD_can_lmc1),y)
+usbcan_SOURCES += lpc17xx_can.c
+endif
+ifeq ($(CONFIG_OC_LINCAN_CARD_ul_usb1),y)
+usbcan_SOURCES += can_lpcbusemu.c ul_usb1.c
+endif
 
 #usbtest_SOURCES +=  ul_idstr.c
 #lib_LOADLIBES =  bspbase ul_drv lpciap keyval lpciap_kvpb mach_hal uldy
 lib_LOADLIBES =  bspbase usbbase usbmore lpcusb mach_hal
-usbcan_MOREOBJS = $(USER_LIB_DIR)/system_stub.o $(USER_LIB_DIR)/ivt.o
+usbcan_MOREOBJS = $(USER_LIB_DIR)/system_stub.o
 nobase_include_HEADERS = usb/usb_defs.h
 
+ifeq ($(MACH),lpc21xx)
 link_VARIANTS = app boot
+usbcan_MOREOBJS += $(USER_LIB_DIR)/ivt.o
+endif
 
 endif #CONFIG_ULBOOT