summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
authorbriggs <briggs@cvs.openbsd.org>1997-03-12 13:24:17 +0000
committerbriggs <briggs@cvs.openbsd.org>1997-03-12 13:24:17 +0000
commit57505bccc5d1dd7a8806135987da69e8b303ac31 (patch)
tree4eba0f4cc218b83a15d494647a4432848842b1e5 /sys/arch
parent8abbc7730e71514a4477fd5be8b95ce993f4cc16 (diff)
New sn arrangements.
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/mac68k/conf/GENERIC5
-rw-r--r--sys/arch/mac68k/conf/GENERICSBC5
-rw-r--r--sys/arch/mac68k/conf/TIGER4
-rw-r--r--sys/arch/mac68k/conf/files.mac68k9
4 files changed, 14 insertions, 9 deletions
diff --git a/sys/arch/mac68k/conf/GENERIC b/sys/arch/mac68k/conf/GENERIC
index 79376f024a7..11180cd4a9b 100644
--- a/sys/arch/mac68k/conf/GENERIC
+++ b/sys/arch/mac68k/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.15 1997/03/08 16:16:46 briggs Exp $
+# $OpenBSD: GENERIC,v 1.16 1997/03/12 13:24:15 briggs Exp $
# $NetBSD: GENERIC,v 1.52 1997/01/13 23:34:07 scottr Exp $
#
# GENERIC
@@ -62,7 +62,7 @@ options HWDIRECT
config bsd swap generic
options GENERIC
-sn0 at obio? # SONIC ethernet (68040)
+sn* at obio? # Internal ethernet
asc0 at obio? # ASC/EASC audio
intvid0 at obio? # Internal video hardware
@@ -70,6 +70,7 @@ intvid0 at obio? # Internal video hardware
nubus0 at mainbus?
ae* at nubus?
+sn* at nubus?
macvid* at nubus?
# Attach grf semantics to all video hardware as it is found
diff --git a/sys/arch/mac68k/conf/GENERICSBC b/sys/arch/mac68k/conf/GENERICSBC
index 41782ae8255..3b30ada5d8f 100644
--- a/sys/arch/mac68k/conf/GENERICSBC
+++ b/sys/arch/mac68k/conf/GENERICSBC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERICSBC,v 1.1 1997/03/08 16:16:46 briggs Exp $
+# $OpenBSD: GENERICSBC,v 1.2 1997/03/12 13:24:15 briggs Exp $
# $NetBSD: GENERIC,v 1.52 1997/01/13 23:34:07 scottr Exp $
#
# GENERIC
@@ -62,7 +62,7 @@ options HWDIRECT
config bsd swap generic
options GENERIC
-sn0 at obio? # SONIC ethernet (68040)
+sn* at obio? # Internal ethernet
asc0 at obio? # ASC/EASC audio
intvid0 at obio? # Internal video hardware
@@ -70,6 +70,7 @@ intvid0 at obio? # Internal video hardware
nubus0 at mainbus?
ae* at nubus?
+sn* at obio?
macvid* at nubus?
# Attach grf semantics to all video hardware as it is found
diff --git a/sys/arch/mac68k/conf/TIGER b/sys/arch/mac68k/conf/TIGER
index 68d11848d3f..ee5746fc711 100644
--- a/sys/arch/mac68k/conf/TIGER
+++ b/sys/arch/mac68k/conf/TIGER
@@ -1,4 +1,4 @@
-# $OpenBSD: TIGER,v 1.2 1997/02/23 06:04:50 briggs Exp $
+# $OpenBSD: TIGER,v 1.3 1997/03/12 13:24:16 briggs Exp $
# $NetBSD: GENERIC,v 1.43 1996/09/22 06:49:09 scottr Exp $
#
# Allen's Q700
@@ -48,7 +48,7 @@ options ZS_CONSOLE_ABORT
config bsd swap generic
options GENERIC
-sn0 at obio? # SONIC ethernet (68040)
+sn* at obio? # SONIC ethernet (68040)
# no internal video, but need interrupts, etc.
intvid* at obio?
diff --git a/sys/arch/mac68k/conf/files.mac68k b/sys/arch/mac68k/conf/files.mac68k
index 274877a737f..3726f9a5b8c 100644
--- a/sys/arch/mac68k/conf/files.mac68k
+++ b/sys/arch/mac68k/conf/files.mac68k
@@ -1,4 +1,4 @@
-# $OpenBSD: files.mac68k,v 1.13 1997/03/08 16:16:47 briggs Exp $
+# $OpenBSD: files.mac68k,v 1.14 1997/03/12 13:24:16 briggs Exp $
# $NetBSD: files.mac68k,v 1.61 1997/03/01 20:22:16 scottr Exp $
# mac68k-specific configuration info
@@ -58,8 +58,11 @@ attach ite at grf
file arch/mac68k/dev/ite.c ite needs-flag
device sn: ifnet, ether
-attach sn at obio_norm
-file arch/mac68k/dev/if_sn.c sn needs-flag
+attach sn at obio_norm with sn_obio
+attach sn at nubus with sn_nubus
+file arch/mac68k/dev/if_sn.c sn
+file arch/mac68k/dev/if_sn_obio.c sn_obio
+file arch/mac68k/dev/if_sn_nubus.c sn_nubus
include "../../../scsi/files.scsi"