summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorJonathan Matthew <jmatthew@cvs.openbsd.org>2014-02-03 14:16:35 +0000
committerJonathan Matthew <jmatthew@cvs.openbsd.org>2014-02-03 14:16:35 +0000
commit7d01e6e155727bb43a4c4669f9eb97ff0b60d044 (patch)
tree16a14e57951cb8d6d5b08c7ddd53642aa42a8fa1 /sys/dev
parentcea0867882ae96e2513d652144d48b62bd403a3b (diff)
use the same option as isp(4) to build without firmware.
stub out the firmware loading code and don't include the firmware files when ISP_NOFIRMWARE is defined.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/ic/qla.c23
1 files changed, 21 insertions, 2 deletions
diff --git a/sys/dev/ic/qla.c b/sys/dev/ic/qla.c
index 9ce91ddbd94..cdd3a018152 100644
--- a/sys/dev/ic/qla.c
+++ b/sys/dev/ic/qla.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: qla.c,v 1.14 2014/02/02 07:53:33 jmatthew Exp $ */
+/* $OpenBSD: qla.c,v 1.15 2014/02/03 14:16:34 jmatthew Exp $ */
/*
* Copyright (c) 2011 David Gwynne <dlg@openbsd.org>
@@ -38,9 +38,10 @@
#include <dev/ic/qlareg.h>
#include <dev/ic/qlavar.h>
-/* firmware */
+#ifndef ISP_NOFIRMWARE
#include <dev/microcode/isp/asm_2200.h>
#include <dev/microcode/isp/asm_2300.h>
+#endif
struct cfdriver qla_cd = {
NULL,
@@ -1736,6 +1737,22 @@ qla_put_cmd_cont(struct qla_softc *sc, void *buf, struct scsi_xfer *xs,
}
#endif
+#ifdef ISP_NOFIRMWARE
+
+int
+qla_load_firmware_2200(struct qla_softc *sc)
+{
+ return (0);
+}
+
+int
+qla_load_firmware_2300(struct qla_softc *sc)
+{
+ return (0);
+}
+
+#else
+
int
qla_load_firmware_2200(struct qla_softc *sc)
{
@@ -1838,6 +1855,8 @@ qla_load_firmware_2300(struct qla_softc *sc)
return (0);
}
+#endif /* ISP_NOFIRMWARE */
+
int
qla_read_nvram(struct qla_softc *sc)
{