X-Git-Url: http://rtime.felk.cvut.cz/gitweb/lincan.git/blobdiff_plain/99ed90d6d898c39a78a78fb65c9df21716f5f6c6..32115f5fda63ffe8b582a10d2f55ae765fec4f41:/lincan/src/Makefile.omk

diff --git a/lincan/src/Makefile.omk b/lincan/src/Makefile.omk
index 8d191f5..e0cf50f 100644
--- a/lincan/src/Makefile.omk
+++ b/lincan/src/Makefile.omk
@@ -1,16 +1,16 @@
 lincan_cards_NAMES = pip pccan smartcan nsi cc_can104 ems_cpcpci \
 		pc_i03 pcm3680 aim104 m437 pcccan ssv bfadcan gensja1000io gensja1000mm eb8245 \
-		kv_pcican msmcan oscar adlink7841 pcan_pci esdpci200 unican virtual template
+		kv_pcican msmcan oscar adlink7841 pcan_pci esdpci200 unican usbcan omap2_spican virtual template
 
-lincan_morecards_NAMES = hms30c7202_can ns_dev_can ipci165 pimx1 tscan1 ts7kv nsi_canpci sh7760
+lincan_morecards_NAMES = esdpci266 hms30c7202_can ns_dev_can ipci165 pimx1 tscan1 ts7kv nsi_canpci sh7760 mpc5200
 
 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 += CONFIG_OC_LINCAN_OMAP_DM_TIMER=n
 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)
 
-
 lincan_cards_SELECTED =	$(filter %.y, $(foreach x, $(lincan_cards_NAMES) $(lincan_morecards_NAMES), $(x).$(CONFIG_OC_LINCAN_CARD_$(x))))
 lincan_cards_SELECTED := $(lincan_cards_SELECTED:%.y=%)
 
@@ -37,11 +37,20 @@ 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
 endif
 
+# both cannot be selected, full MPC5200 has precedence
+ifeq ($(CONFIG_OC_LINCAN_CARD_mpc5200),y)
+lincan_cards_SOURCES += mscan.c
+endif
+
 ifneq ($(CONFIG_OC_LINCANRTL),y)
 
 kernel_MODULES = lincan
@@ -57,7 +66,7 @@ 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 hcan2.c \
+		sja1000p.c sja1000.c i82527.c hcan2.c mcp2515.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)