embedded ul_usb1: adapt this board support to the lpc17xx changes.

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

diff --git a/embedded/app/usbcan/Makefile.omk b/embedded/app/usbcan/Makefile.omk
index c4c7cbae4468a3f9ac69cf9e68effe3b570f7a6b..7d33f7342852d87277784e59121d32270e6933e1 100644 (file)
--- a/embedded/app/usbcan/Makefile.omk
+++ b/embedded/app/usbcan/Makefile.omk
@@ -24,16 +24,18 @@ usbcan_SOURCES += usb_vend.c can_quesysless.c sysdep_sysless.c
 ifeq ($(MACH),lpc17xx)
 usbcan_SOURCES += lpc17xx_can.c
 else #MACH
 ifeq ($(MACH),lpc17xx)
 usbcan_SOURCES += lpc17xx_can.c
 else #MACH

-#usbcan_SOURCES += can_lpcbusemu.c ul_usb1.c
+usbcan_SOURCES += can_lpcbusemu.c ul_usb1.c

 endif #MACH
 
 #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
 endif #MACH
 
 #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

 nobase_include_HEADERS = usb/usb_defs.h
 
 nobase_include_HEADERS = usb/usb_defs.h
 

-#link_VARIANTS = app boot
+ifeq ($(MACH),lpc21xx)
+link_VARIANTS = app boot
+usbcan_MOREOBJS += $(USER_LIB_DIR)/ivt.o
+endif

 
 endif #CONFIG_ULBOOT
 
 endif #CONFIG_ULBOOT