[src/netbsd-1-5]: src/sys/arch/mvme68k/conf Pullup 1.12 - 1.13 (approved by tv)

[scw <scw%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/e8a49c7d2f2a
branches:  netbsd-1-5
changeset: 489789:e8a49c7d2f2a
user:      scw <scw%NetBSD.org@localhost>
date:      Tue Oct 17 19:42:49 2000 +0000

description:
Pullup 1.12 - 1.13 (approved by tv)
Bring support for MVME162 into the 1.5 branch.

diffstat:

 sys/arch/mvme68k/conf/GENERIC |  21 ++++++++++++++-------
 1 files changed, 14 insertions(+), 7 deletions(-)

diffs (54 lines):

diff -r 294f816c4b31 -r e8a49c7d2f2a sys/arch/mvme68k/conf/GENERIC
--- a/sys/arch/mvme68k/conf/GENERIC     Tue Oct 17 17:59:33 2000 +0000
+++ b/sys/arch/mvme68k/conf/GENERIC     Tue Oct 17 19:42:49 2000 +0000
@@ -1,11 +1,12 @@
-#      $NetBSD: GENERIC,v 1.8.2.3 2000/10/05 00:04:07 itojun Exp $
+#      $NetBSD: GENERIC,v 1.8.2.4 2000/10/17 19:42:49 scw Exp $
 
 include                "arch/mvme68k/conf/std.mvme68k"
 
-#ident                 "GENERIC-$Revision: 1.8.2.3 $"
+#ident                 "GENERIC-$Revision: 1.8.2.4 $"
 
 # Boards this kernel supports
 options        MVME147
+options        MVME162
 options        MVME167
 
 maxusers       4
@@ -76,24 +77,30 @@
 # MVME147 specific devices
 pcc0           at mainbus0
 vmepcc0        at pcc?
+vme0           at vmepcc0
 zsc*           at pcc? ipl 4
-zstty*         at zsc? channel ?
 clock0         at pcc? ipl 5
 le0            at pcc? ipl 3
 wdsc0          at pcc? ipl 2
 lpt*           at pcc? ipl 1
 
-# MVME167 specific devices
+# MVME162 and MVME167 shared devices
 pcctwo0                at mainbus0
 vmetwo0        at mainbus0
+vme0           at vmetwo0
 clock0         at pcctwo? ipl 5
-clmpcc0                at pcctwo? ipl 4
 ie0            at pcctwo? ipl 3
 ncrsc0         at pcctwo? ipl 2
+
+# MVME162 specific devices
+zsc*           at pcctwo? ipl 4
+
+# MVME167 specific devices
+clmpcc0                at pcctwo? ipl 4
 lpt*           at pcctwo? ipl 1
 
-vme0           at vmepcc0
-vme0           at vmetwo0
+# Common front-end for MVME147 and MVME162 `zs' device
+zstty*         at zsc? channel ?
 
 # Example VMEbus device
 #foo0          at vme0 addr 0x00ef0000 irq 3 vect 0x80