summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2003-05-05 13:59:39 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2003-05-05 13:59:39 +0000
commit2b8330f895fd9d07649f697b7a039b940ad4ed3c (patch)
tree3bbdb1b665a6f93c0a6ed3ea4b8ea6e03c601e5d
parent97c4ff8627891e95139bdc7bd94a3489eaac540a (diff)
Write explicit scsibus at controller attachment, rather than scsibus at scsi
attribute.
-rw-r--r--sys/arch/mac68k/conf/GENERIC7
-rw-r--r--sys/arch/mac68k/conf/GENERICSBC7
-rw-r--r--sys/arch/mac68k/conf/RAMDISK7
-rw-r--r--sys/arch/mac68k/conf/RAMDISKSBC7
4 files changed, 20 insertions, 8 deletions
diff --git a/sys/arch/mac68k/conf/GENERIC b/sys/arch/mac68k/conf/GENERIC
index 87362810dae..3aed1b2d732 100644
--- a/sys/arch/mac68k/conf/GENERIC
+++ b/sys/arch/mac68k/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.30 2002/06/03 12:04:08 deraadt Exp $
+# $OpenBSD: GENERIC,v 1.31 2003/05/05 13:59:38 miod Exp $
# $NetBSD: GENERIC,v 1.52 1997/01/13 23:34:07 scottr Exp $
#
# GENERIC - an all-in-one kernel for the mac68k
@@ -54,7 +54,10 @@ ite0 at grf?
ncrscsi0 at obio? # SCSI NCR 5380
#sbc0 at obio? flags 0x1 # MI NCR 5380 SCSI Bus Controller
-scsibus* at scsi?
+scsibus* at esp?
+scsibus* at ncrscsi?
+#scsibus* at sbc?
+
sd* at scsibus? target ? lun ? # SCSI disk drives
st* at scsibus? target ? lun ? # SCSI tape drives
cd* at scsibus? target ? lun ? # SCSI CD-ROM drives
diff --git a/sys/arch/mac68k/conf/GENERICSBC b/sys/arch/mac68k/conf/GENERICSBC
index 79f178bbae2..3ca1c0e2b93 100644
--- a/sys/arch/mac68k/conf/GENERICSBC
+++ b/sys/arch/mac68k/conf/GENERICSBC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERICSBC,v 1.14 2002/06/03 12:04:08 deraadt Exp $
+# $OpenBSD: GENERICSBC,v 1.15 2003/05/05 13:59:38 miod Exp $
# $NetBSD: GENERIC,v 1.52 1997/01/13 23:34:07 scottr Exp $
#
# GENERICSBC --- our generic kernel using the SBC SCSI driver
@@ -54,7 +54,10 @@ ite0 at grf?
#ncrscsi0 at obio? # SCSI NCR 5380
sbc0 at obio? flags 0x1 # MI NCR 5380 SCSI Bus Controller
-scsibus* at scsi?
+scsibus* at esp?
+#scsibus* at ncrscsi?
+scsibus* at sbc?
+
sd* at scsibus? target ? lun ? # SCSI disk drives
st* at scsibus? target ? lun ? # SCSI tape drives
cd* at scsibus? target ? lun ? # SCSI CD-ROM drives
diff --git a/sys/arch/mac68k/conf/RAMDISK b/sys/arch/mac68k/conf/RAMDISK
index 7d334599fc2..d51f2646108 100644
--- a/sys/arch/mac68k/conf/RAMDISK
+++ b/sys/arch/mac68k/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.10 2002/04/24 22:34:42 miod Exp $
+# $OpenBSD: RAMDISK,v 1.11 2003/05/05 13:59:38 miod Exp $
#
# RAMDISK - bsd.rd configuration file (non-SBC version)
@@ -70,7 +70,10 @@ ite0 at grf?
ncrscsi0 at obio? # SCSI NCR 5380
#sbc0 at obio? flags 0x1 # MI NCR 5380 SCSI Bus Controller
-scsibus* at scsi?
+scsibus* at esp?
+scsibus* at ncrscsi?
+#scsibus* at sbc?
+
sd* at scsibus? target ? lun ? # SCSI disk drives
st* at scsibus? target ? lun ? # SCSI tape drives
cd* at scsibus? target ? lun ? # SCSI CD-ROM drives
diff --git a/sys/arch/mac68k/conf/RAMDISKSBC b/sys/arch/mac68k/conf/RAMDISKSBC
index 03a5c7a6ce5..01cdd0f9076 100644
--- a/sys/arch/mac68k/conf/RAMDISKSBC
+++ b/sys/arch/mac68k/conf/RAMDISKSBC
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISKSBC,v 1.1 2002/04/24 22:34:42 miod Exp $
+# $OpenBSD: RAMDISKSBC,v 1.2 2003/05/05 13:59:38 miod Exp $
#
# RAMDISKSBC - bsd.rd configuration file (SBC version)
@@ -70,7 +70,10 @@ ite0 at grf?
#ncrscsi0 at obio? # SCSI NCR 5380
sbc0 at obio? flags 0x1 # MI NCR 5380 SCSI Bus Controller
-scsibus* at scsi?
+scsibus* at esp?
+#scsibus* at ncrscsi?
+scsibus* at sbc?
+
sd* at scsibus? target ? lun ? # SCSI disk drives
st* at scsibus? target ? lun ? # SCSI tape drives
cd* at scsibus? target ? lun ? # SCSI CD-ROM drives