summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorHugh Graham <hugh@cvs.openbsd.org>2001-04-09 00:53:54 +0000
committerHugh Graham <hugh@cvs.openbsd.org>2001-04-09 00:53:54 +0000
commit376b13d07aef6922765ef79e074d9b8588968c03 (patch)
treecf9fed2de947d76061d7d0bca682cd347a756060 /sys
parentcdbe01853c9bb3bd7536a759a5e6639385082bde (diff)
Comment out compat vax1k until needed.
Also a large quantity of whitespace fixes.
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/vax/conf/GENERIC42
-rw-r--r--sys/arch/vax/conf/RAMDISK16
2 files changed, 29 insertions, 29 deletions
diff --git a/sys/arch/vax/conf/GENERIC b/sys/arch/vax/conf/GENERIC
index d3d380fb790..ed2c74dba6a 100644
--- a/sys/arch/vax/conf/GENERIC
+++ b/sys/arch/vax/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.21 2001/02/24 10:31:59 hugh Exp $
+# $OpenBSD: GENERIC,v 1.22 2001/04/09 00:53:53 hugh Exp $
# $NetBSD: GENERIC,v 1.61 2000/04/19 06:50:36 itojun Exp $
machine vax # machine type; required
@@ -7,42 +7,42 @@ include "../../../conf/GENERIC"
# Here are all different supported CPU types listed.
# One of these is required.
-#option VAX8600
-#option VAX8200
-#option VAX780 # 11/780
-#option VAX750 # 11/750
-option VAX630 # MV II
-option VAX650 # MV III, 3300, 3600, 3800, 3900
+#option VAX8600
+#option VAX8200
+#option VAX780 # 11/780
+#option VAX750 # 11/750
+option VAX630 # MV II
+option VAX650 # MV III, 3300, 3600, 3800, 3900
option VAX660 # VAX 4000/200
-option VAX670 # VAX 4000/300
+option VAX670 # VAX 4000/300
option VAX680 # VAX 4000/[45]00
-option VAX410 # VS 2000, 3100/{30,}
-option VAX43 # VS 3100/76
-option VAX46 # VS 4000/60
+option VAX410 # VS 2000, 3100/{30,}
+option VAX43 # VS 3100/76
+option VAX46 # VS 4000/60
option VAX48 # VS 4000 VLC
-option VAX49 # VS 4000/90
+option VAX49 # VS 4000/90
option VAX53 # VAX 4000 10X, MicroVAX 3100m9X
-option UVM # VAX uses UVM; REQUIRED
+option UVM # VAX uses UVM; REQUIRED
# Max users on system; this is just a hint
maxusers 8
-option SCSIVERBOSE # Verbose SCSI errors
+option SCSIVERBOSE # Verbose SCSI errors
# WS console uses VT100 terminal emulation
-option WSEMUL_VT100
-option WSDISPLAY_DEFAULTSCREENS=8
+option WSEMUL_VT100
+option WSDISPLAY_DEFAULTSCREENS=8
# Old compat stuff; needed to run 4.3BSD Reno programs.
# Note that if COMPAT_ULTRIX is set, you lose compatibility with
# 4.3BSD Reno programs and get Ultrix compatibility instead.
# (They cannot coexist).
-option COMPAT_VAX1K # Must be present to run pre-1.4 binaries.
-option COMPAT_12
-#option COMPAT_13
-#option COMPAT_14
-#option COMPAT_ULTRIX
+#option COMPAT_VAX1K # Must be present to run pre-1.4 binaries.
+option COMPAT_12
+#option COMPAT_13
+#option COMPAT_14
+#option COMPAT_ULTRIX
option INSN_EMULATE # CPU lacks some hardware instructions.
diff --git a/sys/arch/vax/conf/RAMDISK b/sys/arch/vax/conf/RAMDISK
index a37f8704c2b..41d6926d071 100644
--- a/sys/arch/vax/conf/RAMDISK
+++ b/sys/arch/vax/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.4 2001/02/24 10:31:59 hugh Exp $
+# $OpenBSD: RAMDISK,v 1.5 2001/04/09 00:53:53 hugh Exp $
machine vax # machine type
@@ -50,18 +50,18 @@ option BOOT_CONFIG # boot-time kernel config
config bsd root on rd0a swap on rd0b # and sd0b
# WS console uses VT100 terminal emulation
-option WSEMUL_VT100
-option WSDISPLAY_DEFAULTSCREENS=8
+option WSEMUL_VT100
+option WSDISPLAY_DEFAULTSCREENS=8
# Old compat stuff; needed to run 4.3BSD Reno programs.
# Note that if COMPAT_ULTRIX is set, you lose compatibility with
# 4.3BSD Reno programs and get Ultrix compatibility instead.
# (They cannot coexist).
-option COMPAT_VAX1K # Must be present to run pre-1.4 binaries.
-option COMPAT_12
-#option COMPAT_13
-#option COMPAT_14
-#option COMPAT_ULTRIX
+#option COMPAT_VAX1K # Must be present to run pre-1.4 binaries.
+option COMPAT_12
+#option COMPAT_13
+#option COMPAT_14
+#option COMPAT_ULTRIX
option INSN_EMULATE # CPU lacks some hardware instructions.