Merge branch 'master' into can-usb1

[lincan.git] / lincan / src / Makefile.omk

diff --git a/lincan/src/Makefile.omk b/lincan/src/Makefile.omk
index ebc45ca318aa7740867f0865627394269fd5f3cf..72d28119624a903bb4a65fe81623fd214ee3a7a6 100644 (file)
--- a/lincan/src/Makefile.omk
+++ b/lincan/src/Makefile.omk
@@ -1,11 +1,12 @@
 lincan_cards_NAMES = pip pccan smartcan nsi cc_can104 ems_cpcpci \
-               pc_i03 pcm3680 aim104 m437 pcccan ssv bfadcan pikronisa eb8245 \
-               kv_pcican msmcan oscar adlink7841 unican virtual template
+               pc_i03 pcm3680 aim104 m437 pcccan ssv bfadcan gensja1000io pikronisa eb8245 \
+               kv_pcican msmcan oscar adlink7841 pcan_pci esdpci200 unican usbcan virtual template
 
-lincan_morecards_NAMES = hms30c7202_can ns_dev_can ipci165 pimx1 tscan1
+lincan_morecards_NAMES = hms30c7202_can ns_dev_can ipci165 pimx1 tscan1 nsi_canpci sh7760
 
 default_CONFIG = CONFIG_OC_LINCAN=y CONFIG_OC_LINCANRTL=n CONFIG_OC_LINCANVME=n
 default_CONFIG += CONFIG_OC_LINCAN_PORTIO_ONLY=n CONFIG_OC_LINCAN_MEMIO_ONLY=n
+default_CONFIG += CONFIG_OC_LINCAN_DETAILED_ERRORS=y
 default_CONFIG += $(foreach n, $(lincan_cards_NAMES), CONFIG_OC_LINCAN_CARD_$(n)=y)
 default_CONFIG += $(foreach n, $(lincan_morecards_NAMES), CONFIG_OC_LINCAN_CARD_$(n)=n)
 
@@ -32,9 +33,17 @@ ifeq ($(CONFIG_OC_LINCAN_CARD_ipci165),y)
 lincan_cards_SOURCES += ipci165_fw.c kthread.c
 endif
 
+ifeq ($(CONFIG_OC_LINCAN_CARD_sh7760),y)
+lincan_cards_SOURCES += sh7760.c
+endif
+
+ifeq ($(CONFIG_OC_LINCAN_CARD_usbcan),y)
+lincan_cards_SOURCES += kthread.c
+endif
+
 ifneq ($(filter hms30c7202_can ns_dev_can,$(lincan_cards_SELECTED)),)
 $(warning Not finished C_CAN support requested)
-lincan_cards_SOURCES += c_can.c c_can_irq.c 
+lincan_cards_SOURCES += c_can.c c_can_irq.c
 endif
 
 ifneq ($(CONFIG_OC_LINCANRTL),y)
@@ -52,9 +61,9 @@ endif #CONFIG_OC_LINCANRTL
 
 lincan_SOURCES = can_queue.c can_quekern.c main.c modparms.c \
                devcommon.c setup.c finish.c irq.c sysdep_lnx.c boardlist.c \
-               sja1000p.c sja1000.c i82527.c  \
+               sja1000p.c sja1000.c i82527.c hcan2.c \
                open.c close.c read.c write.c ioctl.c select.c fasync.c \
                proc.c ioctl_query.c ioctl_remote.c \
                $(lincan_cards_SOURCES) $(lincan_rtl_SOURCES)
-               
+
 endif #CONFIG_OC_LINCAN