diff options
| author |   deraadt <deraadt@openbsd.org> | 2014-03-31 04:22:26 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2014-03-31 04:22:26 +0000 |
| commit | b1baa1ad3f862184cd57d32739a79baccf11d7a1 (patch) | |
| tree | ae7f37e875899e21c9370c398446fa43223739d3 | |
| parent | replace bzero with memset (diff) | |
| download | wireguard-openbsd-b1baa1ad3f862184cd57d32739a79baccf11d7a1.tar.xz wireguard-openbsd-b1baa1ad3f862184cd57d32739a79baccf11d7a1.zip | |
give up on isp, and only use ql[wae]
Be a bit cynical about firmware fitting, of course..
ok jmatthew
| -rw-r--r-- | sys/arch/alpha/conf/GENERIC | 3 | ||||
| -rw-r--r-- | sys/arch/alpha/conf/RAMDISK | 7 | ||||
| -rw-r--r-- | sys/arch/alpha/conf/RAMDISKB | 8 | ||||
| -rw-r--r-- | sys/arch/alpha/conf/RAMDISKBIG | 4 | ||||
| -rw-r--r-- | sys/arch/alpha/conf/RAMDISKC | 7 |
5 files changed, 13 insertions, 16 deletions
diff --git a/sys/arch/alpha/conf/GENERIC b/sys/arch/alpha/conf/GENERIC index 97ba987159d..e5dc0ea1366 100644 --- a/sys/arch/alpha/conf/GENERIC +++ b/sys/arch/alpha/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.240 2014/03/12 00:44:10 jmatthew Exp $ +# $OpenBSD: GENERIC,v 1.241 2014/03/31 04:22:26 deraadt Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -195,7 +195,6 @@ cy* at pci? # PCI cyclom card # PCI SCSI devices ahc* at pci? # Adaptec 2940 SCSI controllers -isp* at pci? # Qlogic ISP [12]0x0 SCSI/FibreChannel qlw* at pci? # QLogic ISP SCSI qla* at pci? # QLogic ISP 2[123]xx FibreChannel qle* at pci? # QLogic ISP 2[45]xx FibreChannel diff --git a/sys/arch/alpha/conf/RAMDISK b/sys/arch/alpha/conf/RAMDISK index 26e0cce3129..a2e5bd1db0b 100644 --- a/sys/arch/alpha/conf/RAMDISK +++ b/sys/arch/alpha/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.75 2014/03/14 05:38:31 jmatthew Exp $ +# $OpenBSD: RAMDISK,v 1.76 2014/03/31 04:22:26 deraadt Exp $ # $NetBSD: RAMDISK,v 1.9 1996/12/03 17:25:33 cgd Exp $ machine alpha # architecture, used by config; REQUIRED @@ -90,12 +90,11 @@ sio* at pci? # Intel PCI-ISA bridge tga* at pci? # DEC ZLXp-E[123] graphics pcn* at pci? # AMD PCnet-PCI Ethernet -isp* at pci? # Qlogic ISP [12]0x0 SCSI/FibreChannel qlw* at pci? # QLogic ISP SCSI qla* at pci? # QLogic ISP 2[123]xx FibreChannel -qle* at pci? # QLogic ISP 2[45]xx FibreChannel option ISP_NOFIRMWARE -option QLE_NOFIRMWARE +#qle* at pci? # QLogic ISP 2[45]xx FibreChannel +#option QLE_NOFIRMWARE # Media Independent Interface (mii) drivers amphy* at mii? # AMD 79C873 PHYs diff --git a/sys/arch/alpha/conf/RAMDISKB b/sys/arch/alpha/conf/RAMDISKB index be6edb6beb3..277f32885fe 100644 --- a/sys/arch/alpha/conf/RAMDISKB +++ b/sys/arch/alpha/conf/RAMDISKB @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISKB,v 1.41 2014/03/14 05:38:31 jmatthew Exp $ +# $OpenBSD: RAMDISKB,v 1.42 2014/03/31 04:22:26 deraadt Exp $ # $NetBSD: RAMDISK,v 1.9 1996/12/03 17:25:33 cgd Exp $ machine alpha # architecture, used by config; REQUIRED @@ -83,11 +83,11 @@ sio* at pci? # Intel PCI-ISA bridge tga* at pci? # DEC ZLXp-E[123] graphics #pcn* at pci? # AMD PCnet-PCI Ethernet -isp* at pci? # Qlogic ISP [12]0x0 SCSI/FibreChannel +qlw* at pci? # QLogic ISP SCSI qla* at pci? # Qlogic ISP 2[123]xx FibreChannel -qle* at pci? # Qlogic ISP 2[45]xx FibreChannel option ISP_NOFIRMWARE -option QLE_NOFIRMWARE +#qle* at pci? # Qlogic ISP 2[45]xx FibreChannel +#option QLE_NOFIRMWARE # Media Independent Interface (mii) drivers amphy* at mii? # AMD 79C873 PHYs diff --git a/sys/arch/alpha/conf/RAMDISKBIG b/sys/arch/alpha/conf/RAMDISKBIG index c2bde5610e0..8eede46b562 100644 --- a/sys/arch/alpha/conf/RAMDISKBIG +++ b/sys/arch/alpha/conf/RAMDISKBIG @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISKBIG,v 1.92 2014/03/14 05:38:31 jmatthew Exp $ +# $OpenBSD: RAMDISKBIG,v 1.93 2014/03/31 04:22:26 deraadt Exp $ # $NetBSD: GENERIC,v 1.31 1996/12/03 17:25:29 cgd Exp $ # # Generic Alpha kernel. Enough to get booted, etc., but not much more. @@ -159,7 +159,7 @@ cy* at pci? # PCI cyclom card # PCI SCSI devices ahc* at pci? # Adaptec 2940 SCSI controllers -isp* at pci? # Qlogic ISP [12]0x0 SCSI/FibreChannel +qlw* at pci? # QLogic ISP SCSI qla* at pci? # Qlogic ISP 2[123]xx SCSI/FibreChannel qle* at pci? # Qlogic ISP 2[45]xx SCSI/FibreChannel siop* at pci? # NCR 53c8xx SCSI diff --git a/sys/arch/alpha/conf/RAMDISKC b/sys/arch/alpha/conf/RAMDISKC index 1c2919f1ef6..c00dd9e9a97 100644 --- a/sys/arch/alpha/conf/RAMDISKC +++ b/sys/arch/alpha/conf/RAMDISKC @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISKC,v 1.5 2014/03/14 05:38:31 jmatthew Exp $ +# $OpenBSD: RAMDISKC,v 1.6 2014/03/31 04:22:26 deraadt Exp $ machine alpha # architecture, used by config; REQUIRED @@ -76,11 +76,10 @@ sio* at pci? # Intel PCI-ISA bridge tga* at pci? # DEC ZLXp-E[123] graphics #pcn* at pci? # AMD PCnet-PCI Ethernet -isp* at pci? # Qlogic ISP [12]0x0 SCSI/FibreChannel qla* at pci? # Qlogic ISP 2[123]xx FibreChannel -qle* at pci? # Qlogic ISP 2[45]xx FibreChannel option ISP_NOFIRMWARE -option QLE_NOFIRMWARE +#qle* at pci? # Qlogic ISP 2[45]xx FibreChannel +#option QLE_NOFIRMWARE # Media Independent Interface (mii) drivers #amphy* at mii? # AMD 79C873 PHYs |