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@

6 files changed, 31 insertions, 7 deletions

diff --git a/sys/dev/microcode/isp/asm_2100.h b/sys/dev/microcode/isp/asm_2100.h
index 0b1b7d95c04..b5281131d70 100644
--- a/sys/dev/microcode/isp/asm_2100.h
+++ b/sys/dev/microcode/isp/asm_2100.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: asm_2100.h,v 1.6 2008/07/11 14:46:24 sobrado Exp $ */
+/* $OpenBSD: asm_2100.h,v 1.7 2014/02/10 22:41:27 jmatthew Exp $ */
 /*
  * Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000 QLogic, Inc.
  * All rights reserved.
@@ -44,7 +44,7 @@
 /*
  *	Firmware Version 1.19.24 (14:02 Jul 16, 2002)
  */
-static const u_int16_t isp_2100_risc_code[] = {
+const u_int16_t isp_2100_risc_code[] = {
 	0x0078, 0x102d, 0x0000, 0x95f1, 0x0000, 0x0001, 0x0013, 0x0018,
 	0x0017, 0x2043, 0x4f50, 0x5952, 0x4947, 0x4854, 0x2032, 0x3030,
 	0x3120, 0x514c, 0x4f47, 0x4943, 0x2043, 0x4f52, 0x504f, 0x5241,
@@ -4849,7 +4849,7 @@ static const u_int16_t isp_2100_risc_code[] = {
 /*
  *	Firmware Version 1.15.37 (15:36 May 03, 1999)
  */
-static const u_int16_t isp_2100_risc_code[] = {
+const u_int16_t isp_2100_risc_code[] = {
 	0x0078, 0x1029, 0x0000, 0x66e6, 0x0000, 0x2043, 0x4f50, 0x5952,
 	0x4947, 0x4854, 0x2031, 0x3939, 0x3620, 0x514c, 0x4f47, 0x4943,
 	0x2043, 0x4f52, 0x504f, 0x5241, 0x5449, 0x4f4e, 0x2049, 0x5350,
diff --git a/sys/dev/microcode/isp/asm_2200.h b/sys/dev/microcode/isp/asm_2200.h
index 2949d77314a..07c454b4f8b 100644
--- a/sys/dev/microcode/isp/asm_2200.h
+++ b/sys/dev/microcode/isp/asm_2200.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: asm_2200.h,v 1.7 2008/07/11 14:46:25 sobrado Exp $ */
+/* $OpenBSD: asm_2200.h,v 1.8 2014/02/10 22:41:27 jmatthew Exp $ */
 /* $FreeBSD: src/sys/dev/ispfw/asm_2200.h,v 1.7 2005/01/06 01:42:50 imp Exp $ */
 /*-
  * Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000 QLogic, Inc.
@@ -36,7 +36,7 @@
 /*
  *	Firmware Version 2.02.06 (08:39 Jun 26, 2003)
  */
-static const u_int16_t isp_2200_risc_code[] = {
+const u_int16_t isp_2200_risc_code[] = {
 	0x0470, 0x0000, 0x0000, 0x96cf, 0x0000, 0x0002, 0x0002, 0x0006,
 	0x0007, 0x2043, 0x4f50, 0x5952, 0x4947, 0x4854, 0x2032, 0x3030,
 	0x3120, 0x514c, 0x4f47, 0x4943, 0x2043, 0x4f52, 0x504f, 0x5241,
diff --git a/sys/dev/microcode/isp/asm_2300.h b/sys/dev/microcode/isp/asm_2300.h
index 0df7a294062..367c2ce63e5 100644
--- a/sys/dev/microcode/isp/asm_2300.h
+++ b/sys/dev/microcode/isp/asm_2300.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: asm_2300.h,v 1.5 2008/07/11 14:46:25 sobrado Exp $ */
+/* $OpenBSD: asm_2300.h,v 1.6 2014/02/10 22:41:27 jmatthew Exp $ */
 /* $FreeBSD: src/sys/dev/ispfw/asm_2300.h,v 1.10 2006/11/02 03:23:01 mjacob Exp $ */
 /*-
  * Copyright (C) 2001, 2002, 2003, 2004, 2005 by QLogic, Inc.
@@ -38,7 +38,7 @@
  *	Firmware Version 3.03.19 (09:41 Nov 30, 2005)
  */
 
-static const u_int16_t isp_2300_risc_code[] = {
+const u_int16_t isp_2300_risc_code[] = {
 	0x0470, 0x0000, 0x0000, 0xcd3b, 0x0000, 0x0003, 0x0003, 0x0013,
 	0x0107, 0x2043, 0x4f50, 0x5952, 0x4947, 0x4854, 0x2032, 0x3030,
 	0x3120, 0x514c, 0x4f47, 0x4943, 0x2043, 0x4f52, 0x504f, 0x5241,
diff --git a/sys/dev/microcode/isp/isp_fw2100.c b/sys/dev/microcode/isp/isp_fw2100.c
new file mode 100644
index 00000000000..0b7a9f0313b
--- /dev/null
+++ b/sys/dev/microcode/isp/isp_fw2100.c
@@ -0,0 +1,8 @@
+/* $OpenBSD: isp_fw2100.c,v 1.1 2014/02/10 22:41:27 jmatthew Exp $ */
+/* public domain */
+
+#include <sys/types.h>
+
+#ifndef ISP_NOFIRMWARE
+#include <dev/microcode/isp/asm_2100.h>
+#endif
diff --git a/sys/dev/microcode/isp/isp_fw2200.c b/sys/dev/microcode/isp/isp_fw2200.c
new file mode 100644
index 00000000000..a0aba10044c
--- /dev/null
+++ b/sys/dev/microcode/isp/isp_fw2200.c
@@ -0,0 +1,8 @@
+/* $OpenBSD: isp_fw2200.c,v 1.1 2014/02/10 22:41:27 jmatthew Exp $ */
+/* public domain */
+
+#include <sys/types.h>
+
+#ifndef ISP_NOFIRMWARE
+#include <dev/microcode/isp/asm_2200.h>
+#endif
diff --git a/sys/dev/microcode/isp/isp_fw2300.c b/sys/dev/microcode/isp/isp_fw2300.c
new file mode 100644
index 00000000000..31301f26da3
--- /dev/null
+++ b/sys/dev/microcode/isp/isp_fw2300.c
@@ -0,0 +1,8 @@
+/* $OpenBSD: isp_fw2300.c,v 1.1 2014/02/10 22:41:27 jmatthew Exp $ */
+/* public domain */
+
+#include <sys/types.h>
+
+#ifndef ISP_NOFIRMWARE
+#include <dev/microcode/isp/asm_2300.h>
+#endif