summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2009-07-15 18:15:22 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2009-07-15 18:15:22 +0000
commit0230704e9d57f7589cbb928fa9b0a9e9613eb189 (patch)
tree52e1d680cb37139668122a524ab1dfa9b6b5ead4 /sys/arch
parenta985c52d373fb299cbd6f51ab768f07a923ec47b (diff)
Sync PCI scsi controllers; from Brad.
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/sgi/conf/GENERIC-IP279
-rw-r--r--sys/arch/sgi/conf/GENERIC-IP309
-rw-r--r--sys/arch/sgi/conf/GENERIC-IP329
-rw-r--r--sys/arch/sgi/conf/RAMDISK-IP276
-rw-r--r--sys/arch/sgi/conf/RAMDISK-IP306
-rw-r--r--sys/arch/sgi/conf/RAMDISK-IP326
6 files changed, 33 insertions, 12 deletions
diff --git a/sys/arch/sgi/conf/GENERIC-IP27 b/sys/arch/sgi/conf/GENERIC-IP27
index d32d0e8ae31..38ce46db43b 100644
--- a/sys/arch/sgi/conf/GENERIC-IP27
+++ b/sys/arch/sgi/conf/GENERIC-IP27
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC-IP27,v 1.12 2009/07/13 21:19:22 miod Exp $
+# $OpenBSD: GENERIC-IP27,v 1.13 2009/07/15 18:15:21 miod Exp $
#
# THIS KERNEL IS FOR Origin, Onyx, Fuel, Tezro (IP27, IP35) SYSTEMS ONLY.
#
@@ -60,12 +60,15 @@ owmac* at onewire?
owserial* at onewire?
#### SCSI
+ahc* at pci?
isp* at pci?
-siop* at pci?
mpi* at pci?
+siop* at pci?
+
+scsibus* at ahc?
scsibus* at isp?
-scsibus* at siop?
scsibus* at mpi?
+scsibus* at siop?
# USB Controllers
ohci* at pci? # Open Host Controller
diff --git a/sys/arch/sgi/conf/GENERIC-IP30 b/sys/arch/sgi/conf/GENERIC-IP30
index 305372b2c8a..504b651d8e8 100644
--- a/sys/arch/sgi/conf/GENERIC-IP30
+++ b/sys/arch/sgi/conf/GENERIC-IP30
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC-IP30,v 1.10 2009/07/13 21:19:22 miod Exp $
+# $OpenBSD: GENERIC-IP30,v 1.11 2009/07/15 18:15:21 miod Exp $
#
# THIS KERNEL IS FOR Octane and Octane 2 (IP30) SYSTEMS ONLY.
#
@@ -60,12 +60,15 @@ owmac* at onewire?
owserial* at onewire?
#### SCSI
+ahc* at pci?
isp* at pci?
-siop* at pci?
mpi* at pci?
+siop* at pci?
+
+scsibus* at ahc?
scsibus* at isp?
-scsibus* at siop?
scsibus* at mpi?
+scsibus* at siop?
# USB Controllers
ohci* at pci? # Open Host Controller
diff --git a/sys/arch/sgi/conf/GENERIC-IP32 b/sys/arch/sgi/conf/GENERIC-IP32
index 9f3c440be1c..7e450718253 100644
--- a/sys/arch/sgi/conf/GENERIC-IP32
+++ b/sys/arch/sgi/conf/GENERIC-IP32
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC-IP32,v 1.7 2009/06/24 17:27:40 miod Exp $
+# $OpenBSD: GENERIC-IP32,v 1.8 2009/07/15 18:15:21 miod Exp $
#
# THIS KERNEL IS FOR O2 (IP32) SYSTEMS ONLY.
#
@@ -60,11 +60,14 @@ pci* at macepcibr?
#### SCSI
ahc* at pci?
-siop* at pci?
+isp* at pci?
mpi* at pci?
-scsibus* at siop?
+siop* at pci?
+
scsibus* at ahc?
+scsibus* at isp?
scsibus* at mpi?
+scsibus* at siop?
# USB Controllers
ohci* at pci? # Open Host Controller
diff --git a/sys/arch/sgi/conf/RAMDISK-IP27 b/sys/arch/sgi/conf/RAMDISK-IP27
index 744dd20b42e..63608f9a8b2 100644
--- a/sys/arch/sgi/conf/RAMDISK-IP27
+++ b/sys/arch/sgi/conf/RAMDISK-IP27
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK-IP27,v 1.7 2009/07/13 21:19:22 miod Exp $
+# $OpenBSD: RAMDISK-IP27,v 1.8 2009/07/15 18:15:21 miod Exp $
#
# THIS KERNEL IS FOR Origin, Onyx, Fuel, Tezro (IP27, IP35) SYSTEMS ONLY.
@@ -67,7 +67,9 @@ owmac* at onewire?
owserial* at onewire?
#### SCSI controllers
+ahc* at pci?
isp* at pci?
+mpi* at pci?
siop* at pci?
# USB Controllers
@@ -174,7 +176,9 @@ gentbi* at mii? # Generic 1000BASE-X ten-bit PHY
ukphy* at mii? # "unknown" PHYs
#### SCSI Bus devices
+scsibus* at ahc?
scsibus* at isp?
+scsibus* at mpi?
scsibus* at siop?
sd* at scsibus?
diff --git a/sys/arch/sgi/conf/RAMDISK-IP30 b/sys/arch/sgi/conf/RAMDISK-IP30
index e7a98107b95..83db44b7f31 100644
--- a/sys/arch/sgi/conf/RAMDISK-IP30
+++ b/sys/arch/sgi/conf/RAMDISK-IP30
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK-IP30,v 1.7 2009/07/13 21:19:22 miod Exp $
+# $OpenBSD: RAMDISK-IP30,v 1.8 2009/07/15 18:15:21 miod Exp $
#
# THIS KERNEL IS FOR Octane and Octane 2 (IP30) SYSTEMS ONLY.
@@ -68,7 +68,9 @@ owmac* at onewire?
owserial* at onewire?
#### SCSI controllers
+ahc* at pci?
isp* at pci?
+mpi* at pci?
siop* at pci?
# USB Controllers
@@ -175,7 +177,9 @@ gentbi* at mii? # Generic 1000BASE-X ten-bit PHY
ukphy* at mii? # "unknown" PHYs
#### SCSI Bus devices
+scsibus* at ahc?
scsibus* at isp?
+scsibus* at mpi?
scsibus* at siop?
sd* at scsibus?
diff --git a/sys/arch/sgi/conf/RAMDISK-IP32 b/sys/arch/sgi/conf/RAMDISK-IP32
index 1a68b445b59..46908654248 100644
--- a/sys/arch/sgi/conf/RAMDISK-IP32
+++ b/sys/arch/sgi/conf/RAMDISK-IP32
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK-IP32,v 1.5 2009/06/24 17:27:40 miod Exp $
+# $OpenBSD: RAMDISK-IP32,v 1.6 2009/07/15 18:15:21 miod Exp $
#
# THIS KERNEL IS FOR O2 (IP32) SYSTEMS ONLY.
@@ -65,6 +65,8 @@ pci* at macepcibr? # PCI is on pci bridge
#### SCSI controllers
ahc* at pci?
+isp* at pci?
+mpi* at pci?
siop* at pci?
# USB Controllers
@@ -176,6 +178,8 @@ wskbd* at pckbd? console ?
#### SCSI Bus devices
scsibus* at ahc?
+scsibus* at isp?
+scsibus* at mpi?
scsibus* at siop?
sd* at scsibus?