for the isp(4) driver, invert the meaning of the options which pull

firmwares into the smaller (and larger) media
ok krw

4 files changed, 12 insertions, 12 deletions

diff --git a/sys/arch/sparc/conf/GENERIC b/sys/arch/sparc/conf/GENERIC
index 376630791b2..315ac6f0cb5 100644
--- a/sys/arch/sparc/conf/GENERIC
+++ b/sys/arch/sparc/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.91 2009/05/20 18:22:32 miod Exp $
+#	$OpenBSD: GENERIC,v 1.92 2009/06/24 11:38:40 deraadt Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -160,7 +160,6 @@ esp*	at dma? flags 0x00ff000f			# depending on model
 
 #sun4c, sun4m
 isp*	at sbus?
-options ISP_COMPILE_1000_FW=1
 
 # sun4m Ethernet - an AMD 7990 LANCE behind
 # specialized DMA glue
diff --git a/sys/arch/sparc/conf/SUN4C b/sys/arch/sparc/conf/SUN4C
index 2eab1f04d60..52526975cfe 100644
--- a/sys/arch/sparc/conf/SUN4C
+++ b/sys/arch/sparc/conf/SUN4C
@@ -1,4 +1,4 @@
-#	$OpenBSD: SUN4C,v 1.59 2009/05/20 18:22:33 miod Exp $
+#	$OpenBSD: SUN4C,v 1.60 2009/06/24 11:38:40 deraadt Exp $
 #	$NetBSD: GENERIC,v 1.48 1997/08/23 19:19:01 mjacob Exp $
 
 # Machine architecture; required by config(8)
@@ -99,7 +99,6 @@ esp*	at dma? flags 0x00ff000f			# depending on model
 
 #sun4c, sun4m
 isp*	at sbus?
-options ISP_COMPILE_1000_FW=1
 
 # sun4/300 and sun4c Ethernet - an AMD 7990 LANCE
 le0	at sbus0					# sun4c on-board
diff --git a/sys/arch/sparc/conf/SUN4M b/sys/arch/sparc/conf/SUN4M
index a13f8662a06..9ad6cdb4170 100644
--- a/sys/arch/sparc/conf/SUN4M
+++ b/sys/arch/sparc/conf/SUN4M
@@ -1,4 +1,4 @@
-#	$OpenBSD: SUN4M,v 1.74 2009/05/20 18:22:33 miod Exp $
+#	$OpenBSD: SUN4M,v 1.75 2009/06/24 11:38:40 deraadt Exp $
 #	$NetBSD: GENERIC,v 1.28.2.1 1996/07/02 23:55:22 jtc Exp $
 
 # Machine architecture; required by config(8)
@@ -115,7 +115,6 @@ esp*	at dma? flags 0x00ff000f			# depending on model
 
 #sun4c, sun4m
 isp*	at sbus?
-options ISP_COMPILE_1000_FW=1
 
 # sun4m Ethernet - an AMD 7990 LANCE behind
 # specialized DMA glue
diff --git a/sys/arch/sparc/dev/isp_sbus.c b/sys/arch/sparc/dev/isp_sbus.c
index 59cc9292ab7..97acb49f4a1 100644
--- a/sys/arch/sparc/dev/isp_sbus.c
+++ b/sys/arch/sparc/dev/isp_sbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: isp_sbus.c,v 1.27 2009/06/24 11:00:53 krw Exp $	*/
+/*	$OpenBSD: isp_sbus.c,v 1.28 2009/06/24 11:38:40 deraadt Exp $	*/
 /*
  * SBus specific probe and attach routines for Qlogic ISP SCSI adapters.
  *
@@ -43,8 +43,15 @@
 #include <sparc/sparc/cpuvar.h>
 
 #include <dev/ic/isp_openbsd.h>
-#if	defined(ISP_COMPILE_FW) || defined(ISP_COMPILE_1000_FW)
+
+#ifndef ISP_NOFIRMWARE
+#define ISP_FIRMWARE_1000
+#endif
+
+#if	defined(ISP_FIRMWARE_1000)
 #include <dev/microcode/isp/asm_sbus.h>
+#else
+#define	ISP_1000_RISC_CODE	NULL
 #endif
 
 #define ISP_SBUSIFY_ISPHDR(isp, hdrp)					\
@@ -67,10 +74,6 @@ static void
 isp_sbus_dmateardown(struct ispsoftc *, struct scsi_xfer *, u_int32_t);
 static int isp_sbus_intr(void *);
 
-#ifndef	ISP_1000_RISC_CODE
-#define	ISP_1000_RISC_CODE	NULL
-#endif
-
 static struct ispmdvec mdvec = {
 	isp_sbus_rd_isr,
 	isp_sbus_rd_reg,