embedded: use standard CONFIG_OC_LINCAN_CARD_xxx option to distinguish required hardware.

Signed-off-by: Pavel Pisa <pisa@cmp.felk.cvut.cz>

diff --git a/embedded/app/usbcan/Makefile.omk b/embedded/app/usbcan/Makefile.omk
index 7d33f7342852d87277784e59121d32270e6933e1..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 += 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
 
 
 LOCAL_CONFIG_H = local_config.h
 


@@ -21,11 +24,12 @@ INCLUDES += -I.
 bin_PROGRAMS = usbcan
 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
 bin_PROGRAMS = usbcan
 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 ($(MACH),lpc17xx)
+ifeq ($(CONFIG_OC_LINCAN_CARD_can_lmc1),y)

 usbcan_SOURCES += lpc17xx_can.c
 usbcan_SOURCES += lpc17xx_can.c

-else #MACH
+endif
+ifeq ($(CONFIG_OC_LINCAN_CARD_ul_usb1),y)

 usbcan_SOURCES += can_lpcbusemu.c ul_usb1.c
 usbcan_SOURCES += can_lpcbusemu.c ul_usb1.c

-endif #MACH
+endif

 
 #usbtest_SOURCES +=  ul_idstr.c
 #lib_LOADLIBES =  bspbase ul_drv lpciap keyval lpciap_kvpb mach_hal uldy
 
 #usbtest_SOURCES +=  ul_idstr.c
 #lib_LOADLIBES =  bspbase ul_drv lpciap keyval lpciap_kvpb mach_hal uldy

diff --git a/embedded/app/usbcan/main.c b/embedded/app/usbcan/main.c
index 603168d1b9baff54cc00b67862c922dd2fb27d75..54b505ad330766388a1b9cbcbdea6c7fdeac0692 100644 (file)
--- a/embedded/app/usbcan/main.c
+++ b/embedded/app/usbcan/main.c
@@ -250,10 +250,12 @@ int main(void)
 
        
 
 
        
 

+#ifdef CONFIG_OC_LINCAN_CARD_ul_usb1

        ul_usb1_register(candev->hwspecops);
        ul_usb1_register(candev->hwspecops);

-//     can_lmc1_register(candev->hwspecops);
-
-       
+#endif
+#ifdef CONFIG_OC_LINCAN_CARD_can_lmc1
+       can_lmc1_register(candev->hwspecops);
+#endif

 
        bd=baudrate[0];
        if (candev->hwspecops->init_hw_data(candev)){
 
        bd=baudrate[0];
        if (candev->hwspecops->init_hw_data(candev)){

diff --git a/embedded/board/arm/lpc17xx-common/config/config.usbcan b/embedded/board/arm/lpc17xx-common/config/config.usbcan
index ec976dbb6ee662de7244561c6002e99e99b3b4ce..147fcdbe1641eb089080a5675a95ef970affa360 100644 (file)
--- a/embedded/board/arm/lpc17xx-common/config/config.usbcan
+++ b/embedded/board/arm/lpc17xx-common/config/config.usbcan
@@ -18,6 +18,8 @@ CONFIG_USB_LPCUSB=y
 
 CONFIG_APP_USBCAN=y
 #CONFIG_APP_USBLED=y
 
 CONFIG_APP_USBCAN=y
 #CONFIG_APP_USBLED=y

+CONFIG_OC_LINCAN_CARD_can_lmc1=y
+

 
 CONFIG_OC_UL_DRV_SYSLESS=n
 CONFIG_ULAN_DY=n
 
 CONFIG_OC_UL_DRV_SYSLESS=n
 CONFIG_ULAN_DY=n

diff --git a/embedded/board/arm/ul_usb1/config/config.usbcan b/embedded/board/arm/ul_usb1/config/config.usbcan
index f7320f654dcfa2425f25c96fbb7abae8b19cbb4c..2ee967a6fe09f9183f5ed8293e432859032364c4 100644 (file)
--- a/embedded/board/arm/ul_usb1/config/config.usbcan
+++ b/embedded/board/arm/ul_usb1/config/config.usbcan
@@ -22,6 +22,7 @@ CONFIG_USB_BASE=y
 CONFIG_USB_MORE=y
 CONFIG_USB_LPCUSB=y
 CONFIG_APP_USBCAN=y
 CONFIG_USB_MORE=y
 CONFIG_USB_LPCUSB=y
 CONFIG_APP_USBCAN=y

+CONFIG_OC_LINCAN_CARD_ul_usb1=y

 #CONFIG_APP_USBBOOT=y
 #CONFIG_ULBOOT=y
 
 #CONFIG_APP_USBBOOT=y
 #CONFIG_ULBOOT=y