summaryrefslogtreecommitdiff
path: root/sys/conf
diff options
context:
space:
mode:
authorJonathan Matthew <jmatthew@cvs.openbsd.org>2014-02-10 22:41:28 +0000
committerJonathan Matthew <jmatthew@cvs.openbsd.org>2014-02-10 22:41:28 +0000
commit3c9ee15104feb68b7719d1877d640d5f9af67c75 (patch)
tree1506099fd77a3dcd8f76ec60c792722546cf8f01 /sys/conf
parentac165f3c3b3b5ba36058c9e163a0a05dec3b7009 (diff)
Build isp2xxx firmware into separate object files so we only include
one copy when both isp(4) and qla(4) are enabled. This is a temporary measure until qla(4) takes over completely. looked at by miod@ and kettenis@
Diffstat (limited to 'sys/conf')
-rw-r--r--sys/conf/files7
1 files changed, 6 insertions, 1 deletions
diff --git a/sys/conf/files b/sys/conf/files
index 1e75b16ebb9..3831b2ad6c3 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1,4 +1,4 @@
-# $OpenBSD: files,v 1.565 2014/01/19 06:04:03 jmatthew Exp $
+# $OpenBSD: files,v 1.566 2014/02/10 22:41:27 jmatthew Exp $
# $NetBSD: files,v 1.87 1996/05/19 17:17:50 jonathan Exp $
# @(#)files.newconf 7.5 (Berkeley) 5/10/93
@@ -199,6 +199,11 @@ file dev/ic/isp_library.c isp
device qla: scsi
file dev/ic/qla.c qla
+# QLogic firmware shared between qla and isp
+file dev/microcode/isp/isp_fw2100.c qla | isp_pci
+file dev/microcode/isp/isp_fw2200.c qla | isp
+file dev/microcode/isp/isp_fw2300.c qla | isp_pci
+
# Advanced Host Controller Interface for Serial ATA
device ahci: scsi, atascsi
file dev/ic/ahci.c ahci | ahci_pci | ahci_jmb needs-flag