summaryrefslogtreecommitdiff
path: root/sys/arch/vax/conf
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch/vax/conf')
-rw-r--r--sys/arch/vax/conf/GENERIC17
-rw-r--r--sys/arch/vax/conf/RAMDISK15
-rw-r--r--sys/arch/vax/conf/files.vax6
3 files changed, 34 insertions, 4 deletions
diff --git a/sys/arch/vax/conf/GENERIC b/sys/arch/vax/conf/GENERIC
index 67c30fa724b..aed634833eb 100644
--- a/sys/arch/vax/conf/GENERIC
+++ b/sys/arch/vax/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.48 2006/11/06 20:28:20 miod Exp $
+# $OpenBSD: GENERIC,v 1.49 2008/08/18 23:19:21 miod Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -30,6 +30,7 @@ option VAX46 # VS 4000/60
option VAX48 # VS 4000 VLC
option VAX49 # VS 4000/90
option VAX53 # VAX 4000 10X, MicroVAX 3100m9X
+option VAX60 # VS 3[58][24]0
option VXT # VXT2000 and VXT2000+
# Old compat stuff; needed to run 4.3BSD Reno programs.
@@ -50,10 +51,11 @@ mainbus0 at root
#sbi0 at mainbus0 # SBI, master bus on 11/780.
#cmi0 at mainbus0 # 11/750 internal bus.
#bi0 at mainbus0 # VAX 8200
-vsbus0 at mainbus0 # All VAXstations
+vsbus0 at mainbus0 # All VAXstations but 3[58][24]0
ibus0 at mainbus0 # All Microvax
#nbi0 at mainbus0 # VAX 8800
#xmi0 at mainbus0 # VAX 6000
+mbus0 at mainbus0 # VS 3[58][24]0
vxtbus0 at mainbus0 # VXT2000
# Vsbus, the virtual VAXstation bus, and possible devices.
@@ -80,6 +82,16 @@ ze0 at ibus0 # SGEC on-board ethernet
le0 at ibus0 # LANCE ethernet (MV3400)
#shac0 at ibus0 # DSSI controller
+# M-bus found on VS 3[58][24]0
+fwio* at mbus0 mid ? # I/O module
+uba0 at mbus0 mid 0
+
+dz0 at fwio? # DZ-11 like serial ports
+dz* at fwio? # DZ-11 (on additional fwio)
+le0 at fwio? # LANCE ethernet
+le* at fwio? # LANCE (on additional fwio)
+sii* at fwio? # SII SCSI
+
# VXT2000 devices
ze0 at vxtbus0 # SGEC on-board ethernet
qsc0 at vxtbus0 # serial ports
@@ -133,6 +145,7 @@ mt* at mscpbus? drive? # MSCP tape
# SCSI devices
scsibus* at asc?
scsibus* at ncr?
+scsibus* at sii?
sd* at scsibus?
st* at scsibus?
diff --git a/sys/arch/vax/conf/RAMDISK b/sys/arch/vax/conf/RAMDISK
index bffd1545fef..ec7e7f96b5d 100644
--- a/sys/arch/vax/conf/RAMDISK
+++ b/sys/arch/vax/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.29 2008/06/08 20:37:39 deraadt Exp $
+# $OpenBSD: RAMDISK,v 1.30 2008/08/18 23:19:21 miod Exp $
machine vax # machine type
@@ -22,6 +22,7 @@ option VAX46 # VS 4000/60
option VAX48 # VS 4000 VLC
option VAX49 # VS 4000/90
option VAX53 # VAX 4000/10{0,5,6}
+option VAX60 # VS 3[58][24]0
option VXT # VXT2000 and VXT2000+
maxusers 8 # estimated number of users
@@ -61,6 +62,7 @@ vsbus0 at mainbus0 # All VAXstations
ibus0 at mainbus0 # All Microvax
#nbi0 at mainbus0 # VAX 8800
#xmi0 at mainbus0 # VAX 6000
+mbus0 at mainbus0 # VS 3[58][24]0
vxtbus0 at mainbus0 # VXT2000
# Vsbus, the virtual VAXstation bus, and possible devices.
@@ -87,6 +89,16 @@ ze0 at ibus0 # SGEC on-board ethernet
le0 at ibus0 # LANCE ethernet
#shac0 at ibus0 # DSSI controller
+# M-bus found on VS 3[58][24]0
+fwio* at mbus0 mid ? # I/O module
+uba0 at mbus0 mid 0
+
+dz0 at fwio? # DZ-11 like serial ports
+dz* at fwio? # DZ-11 (on additional fwio)
+le0 at fwio? # LANCE ethernet
+le* at fwio? # LANCE (on additional fwio)
+sii* at fwio? # SII SCSI
+
# VXT2000 devices
ze0 at vxtbus0 # SGEC on-board ethernet
qsc0 at vxtbus0 # serial ports
@@ -140,6 +152,7 @@ mt* at mscpbus? drive? # MSCP tape
# SCSI devices
scsibus* at asc?
scsibus* at ncr?
+scsibus* at sii?
sd* at scsibus?
st* at scsibus?
diff --git a/sys/arch/vax/conf/files.vax b/sys/arch/vax/conf/files.vax
index 11ae4b2987d..0c34f42ef43 100644
--- a/sys/arch/vax/conf/files.vax
+++ b/sys/arch/vax/conf/files.vax
@@ -1,4 +1,4 @@
-# $OpenBSD: files.vax,v 1.47 2008/08/18 23:07:22 miod Exp $
+# $OpenBSD: files.vax,v 1.48 2008/08/18 23:19:21 miod Exp $
# $NetBSD: files.vax,v 1.60 1999/08/27 20:04:32 ragge Exp $
#
# new style config file for vax architecture
@@ -340,6 +340,9 @@ device dh # XXX?
attach dh at uba
file arch/vax/uba/dh.c dh needs-flag
+# M-bus on VS 3[58][24]0
+include "arch/vax/mbus/files.mbus"
+
# Blinkenlichten
device led
attach led at mainbus
@@ -362,6 +365,7 @@ file arch/vax/vax/ka46.c vax46
file arch/vax/vax/ka48.c vax48
file arch/vax/vax/ka49.c vax49
file arch/vax/vax/ka53.c vax53
+file arch/vax/vax/ka60.c vax60
file arch/vax/vax/emulate.s insn_emulate
file arch/vax/vax/unimpl_emul.s insn_emulate
file arch/vax/vax/ka650.c vax650