summaryrefslogtreecommitdiffstats
path: root/sys/modules/mrsas
diff options
context:
space:
mode:
authorsmh <smh@FreeBSD.org>2014-12-21 02:35:22 +0000
committersmh <smh@FreeBSD.org>2014-12-21 02:35:22 +0000
commit4749aacddd68c5e6f458ef3ab31505bbdc7f5630 (patch)
tree27d095c1e4733fc868ac6a3f1b64ad8a5c4e5c8b /sys/modules/mrsas
parent90167d8975073c532726b475b01d8a7b81094d64 (diff)
downloadFreeBSD-src-4749aacddd68c5e6f458ef3ab31505bbdc7f5630.zip
FreeBSD-src-4749aacddd68c5e6f458ef3ab31505bbdc7f5630.tar.gz
MFC r272735:
Support upto 256VD. MFC r272737: Support 32-bit linux binaries on FreeBSD 64bit. MFC r272738: Fix the minor svn add issue. MFC r272739: Extended MSI-x vectors support for Invader and Fury(12Gb/s HBA). MFC r272740: Add d_poll support. MFC r272741: Fix leak of mfi cmd in the passthru and correctly limit oustanding. MFC r272742: Import vendor Phase 6.5 driver MFC r272744: Style (9) fixes. MFC r273040: Fix for build issue on i386.xen and amd64.xen. Sponsored by: Multiplay
Diffstat (limited to 'sys/modules/mrsas')
-rw-r--r--sys/modules/mrsas/Makefile20
-rw-r--r--sys/modules/mrsas/mrsas_linux/Makefile10
2 files changed, 25 insertions, 5 deletions
diff --git a/sys/modules/mrsas/Makefile b/sys/modules/mrsas/Makefile
index 7ff6c81..5976b98 100644
--- a/sys/modules/mrsas/Makefile
+++ b/sys/modules/mrsas/Makefile
@@ -1,14 +1,24 @@
+# Makefile for mrsas driver
# $FreeBSD$
-.PATH: ${.CURDIR}/../../dev/mrsas
+KMOD=mrsas
+.PATH: ${.CURDIR}/../../dev/${KMOD}
-KMOD= mrsas
-SRCS= mrsas.c mrsas_cam.c mrsas_ioctl.c mrsas_fp.c
-SRCS+= device_if.h bus_if.h pci_if.h opt_cam.h opt_scsi.h
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64"
+SUBDIR+= mrsas_linux
+.endif
+
+SRCS=mrsas.c mrsas_cam.c mrsas_ioctl.c mrsas_fp.c
+SRCS+= device_if.h bus_if.h pci_if.h opt_cam.h opt_scsi.h
#CFLAGS+= -MRSAS_DEBUG
.include <bsd.kmod.mk>
-#CFLAGS+= -fgnu89-inline
+CFLAGS+= -fgnu89-inline
+
+TARGET_ARCH = ${MACHINE_ARCH}
+.if ${TARGET_ARCH} == "amd64"
+CFLAGS+= -DCOMPAT_FREEBSD32 -D_STANDALONE
+.endif
clean_cscope:
rm -f cscope*
diff --git a/sys/modules/mrsas/mrsas_linux/Makefile b/sys/modules/mrsas/mrsas_linux/Makefile
new file mode 100644
index 0000000..3563892
--- /dev/null
+++ b/sys/modules/mrsas/mrsas_linux/Makefile
@@ -0,0 +1,10 @@
+# Makefile for mrsas driver
+# $FreeBSD$
+
+.PATH: ${.CURDIR}/../../../dev/mrsas
+
+KMOD= mrsas_linux
+SRCS= mrsas_linux.c
+SRCS+= device_if.h bus_if.h pci_if.h
+
+.include <bsd.kmod.mk>
OpenPOWER on IntegriCloud