option not options

5 files changed, 122 insertions, 146 deletions

diff --git a/sys/arch/mvme68k/conf/GENERIC b/sys/arch/mvme68k/conf/GENERIC
index f90abb24677..8c793036a83 100644
--- a/sys/arch/mvme68k/conf/GENERIC
+++ b/sys/arch/mvme68k/conf/GENERIC
@@ -1,55 +1,25 @@
-#	$OpenBSD: GENERIC,v 1.7 1996/05/27 21:48:08 chuck Exp $
+#	$OpenBSD: GENERIC,v 1.8 1996/06/30 17:39:38 deraadt Exp $
 
 machine		mvme68k m68k
 
-#options	"M68060"	# support for 060
-options		"M68040"	# support for 040
-options		FPSP		# MC68040 floating point support
-options		"M68030"	# support for 030
-options		FPCOPROC	# Support for MC6888[12] (Required)
-
-options		MVME147		# (requires M68030)
-options		MVME162		# (requires M68040, FPSP)
-options		MVME167		# includes 166 (requires M68040, FPSP)
-#options	MVME177		# (requires M68060, ...)
-
-maxusers	6
-
-# obsolete timezone spec
-options		TIMEZONE=0, DST=0
-
-#options	DIAGNOSTIC, DEBUG
-options		DDB
-options		FFS
-options		NFSCLIENT
-options		NFSSERVER
-options		SYSVSEM,SYSVMSG,SYSVSHM
-options 	KTRACE
-options 	COMPAT_43
-options 	FIFO
-#options	MFS
-options		DEVPAGER, SWAPPAGER, VNODEPAGER
-#options	MSDOSFS
-
-options		COMPAT_SUNOS
-
-# Networking options
-options		INET
-options		TCP_COMPAT_42	# compatibility with 4.2BSD TCP/IP
-options		GATEWAY		# IP packet forwarding
-#options	ISO		# OSI networking
-#options	TPIP
-#options	EON
-#options	COMPAT_09, COMPAT_10
+include "../../../conf/GENERIC"
 
-config		bsd		swap generic
+#option		M68060		# support for 060
+option		M68040		# support for 040
+option		FPSP		# MC68040 floating point support
+option		M68030		# support for 030
+option		FPCOPROC	# Support for MC6888[12] (Required)
 
-pseudo-device	sl 2
-pseudo-device	ppp 2
-pseudo-device	loop
-pseudo-device	bpfilter
-pseudo-device	pty
-pseudo-device	rd 2
+option		MVME147		# (requires M68030)
+option		MVME162		# (requires M68040, FPSP)
+option		MVME167		# includes 166 (requires M68040, FPSP)
+#option		MVME177		# (requires M68060, ...)
+
+option		COMPAT_SUNOS
+
+maxusers	32
+
+config		bsd		swap generic
 
 mainbus0 at root
 
@@ -108,3 +78,9 @@ cd*	at scsibus? target ? lun ?
 ch*	at scsibus? target ? lun ?
 ss*	at scsibus? target ? lun ?
 uk*	at scsibus? target ? lun ?
+
+pseudo-device	rd 2
+
+#si0	at vmes0 addr 0xff200000 ipl 2 vec 0x40
+#nxdc0	at vmes0 addr 0xff00ee80 ipl 2 vec 0x44
+#xd*	at xdc? target ?
diff --git a/sys/arch/mvme68k/conf/MVME147 b/sys/arch/mvme68k/conf/MVME147
index 3737c5df652..4074ffa5238 100644
--- a/sys/arch/mvme68k/conf/MVME147
+++ b/sys/arch/mvme68k/conf/MVME147
@@ -1,44 +1,44 @@
-#	$OpenBSD: MVME147,v 1.6 1996/05/27 22:47:56 deraadt Exp $
+#	$OpenBSD: MVME147,v 1.7 1996/06/30 17:39:40 deraadt Exp $
 
 machine		mvme68k m68k
 
-#options	"M68040"	# support for 040
-#options	FPSP		# MC68040 floating point support
-options		"M68030"	# support for 030
-options		FPCOPROC	# Support for MC6888[12] (Required)
+#option		"M68040"	# support for 040
+#option		FPSP		# MC68040 floating point support
+option		"M68030"	# support for 030
+option		FPCOPROC	# Support for MC6888[12] (Required)
 
-options		MVME147		# (requires M68030)
-#options	MVME162		# (requires M68040)
-#options	MVME167		# includes 166 (requires M68040)
+option		MVME147		# (requires M68030)
+#option		MVME162		# (requires M68040)
+#option		MVME167		# includes 166 (requires M68040)
 
 maxusers	6
 
 # obsolete timezone spec
-options		TIMEZONE=0, DST=0
-
-#options	DIAGNOSTIC, DEBUG
-options		DDB
-options		FFS
-options		NFSCLIENT
-options		NFSSERVER
-options		SYSVSEM,SYSVMSG,SYSVSHM
-options 	KTRACE
-options 	COMPAT_43
-options 	FIFO
-#options	MFS
-options		DEVPAGER, SWAPPAGER, VNODEPAGER
-#options	MSDOSFS
-
-options		COMPAT_SUNOS
+option		TIMEZONE=0, DST=0
+
+#option		DIAGNOSTIC, DEBUG
+option		DDB
+option		FFS
+option		NFSCLIENT
+option		NFSSERVER
+option		SYSVSEM,SYSVMSG,SYSVSHM
+option 	KTRACE
+option 	COMPAT_43
+option 	FIFO
+#option		MFS
+option		DEVPAGER, SWAPPAGER, VNODEPAGER
+#option		MSDOSFS
+
+option		COMPAT_SUNOS
 
 # Networking options
-options		INET
-options		TCP_COMPAT_42	# compatibility with 4.2BSD TCP/IP
-options		GATEWAY		# IP packet forwarding
-#options	ISO		# OSI networking
-#options	TPIP
-#options	EON
-#options	COMPAT_09, COMPAT_10
+option		INET
+option		TCP_COMPAT_42	# compatibility with 4.2BSD TCP/IP
+option		GATEWAY		# IP packet forwarding
+#option		ISO		# OSI networking
+#option		TPIP
+#option		EON
+#option		COMPAT_09, COMPAT_10
 
 config		bsd	swap generic
 
diff --git a/sys/arch/mvme68k/conf/MVME162 b/sys/arch/mvme68k/conf/MVME162
index 4de28324c4c..df518837988 100644
--- a/sys/arch/mvme68k/conf/MVME162
+++ b/sys/arch/mvme68k/conf/MVME162
@@ -1,44 +1,44 @@
-#	$OpenBSD: MVME162,v 1.6 1996/05/27 22:47:56 deraadt Exp $
+#	$OpenBSD: MVME162,v 1.7 1996/06/30 17:39:41 deraadt Exp $
 
 machine		mvme68k m68k
 
-options		"M68040"	# support for 040
-options		FPSP		# MC68040 floating point support
-#options	"M68030"	# support for 030
-#options	FPCOPROC	# Support for MC6888[12] (Required)
+option		"M68040"	# support for 040
+option		FPSP		# MC68040 floating point support
+#option		"M68030"	# support for 030
+#option		FPCOPROC	# Support for MC6888[12] (Required)
 
-#options	MVME147		# (requires M68030)
-options		MVME162		# (requires M68040)
-#options	MVME167		# includes 166 (requires M68040)
+#option		MVME147		# (requires M68030)
+option		MVME162		# (requires M68040)
+#option		MVME167		# includes 166 (requires M68040)
 
 maxusers	6
 
 # obsolete timezone spec
-options		TIMEZONE=0, DST=0
-
-#options	DIAGNOSTIC, DEBUG
-options		DDB
-options		FFS
-options		NFSCLIENT
-options		NFSSERVER
-options		SYSVSEM,SYSVMSG,SYSVSHM
-options 	KTRACE
-options 	COMPAT_43
-options 	FIFO
-#options	MFS
-options		DEVPAGER, SWAPPAGER, VNODEPAGER
-#options	MSDOSFS
-
-options		COMPAT_SUNOS
-
-# Networking options
-options		INET
-options		TCP_COMPAT_42	# compatibility with 4.2BSD TCP/IP
-options		GATEWAY		# IP packet forwarding
-#options	ISO		# OSI networking
-#options	TPIP
-#options	EON
-#options	COMPAT_09, COMPAT_10
+option		TIMEZONE=0, DST=0
+
+#option		DIAGNOSTIC, DEBUG
+option		DDB
+option		FFS
+option		NFSCLIENT
+option		NFSSERVER
+option		SYSVSEM,SYSVMSG,SYSVSHM
+option 		KTRACE
+option 		COMPAT_43
+option 		FIFO
+#option		MFS
+option		DEVPAGER, SWAPPAGER, VNODEPAGER
+#option		MSDOSFS
+
+option		COMPAT_SUNOS
+
+# Networking option
+option		INET
+option		TCP_COMPAT_42	# compatibility with 4.2BSD TCP/IP
+option		GATEWAY		# IP packet forwarding
+#option		ISO		# OSI networking
+#option		TPIP
+#option		EON
+#option		COMPAT_09, COMPAT_10
 
 config		bsd	swap generic
 
diff --git a/sys/arch/mvme68k/conf/MVME167 b/sys/arch/mvme68k/conf/MVME167
index ae000f8ecb9..ce4eecc76ae 100644
--- a/sys/arch/mvme68k/conf/MVME167
+++ b/sys/arch/mvme68k/conf/MVME167
@@ -1,44 +1,44 @@
-#	$OpenBSD: MVME167,v 1.6 1996/05/27 22:47:57 deraadt Exp $
+#	$OpenBSD: MVME167,v 1.7 1996/06/30 17:39:42 deraadt Exp $
 
 machine		mvme68k m68k
 
-options		"M68040"	# support for 040
-options		FPSP		# MC68040 floating point support
-#options	"M68030"	# support for 030
-#options	FPCOPROC	# Support for MC6888[12] (Required)
+option		"M68040"	# support for 040
+option		FPSP		# MC68040 floating point support
+#option		"M68030"	# support for 030
+#option		FPCOPROC	# Support for MC6888[12] (Required)
 
-#options	MVME147		# (requires M68030)
-#options	MVME162		# (requires M68040)
-options		MVME167		# includes 166 (requires M68040)
+#option		MVME147		# (requires M68030)
+#option		MVME162		# (requires M68040)
+option		MVME167		# includes 166 (requires M68040)
 
 maxusers	6
 
 # obsolete timezone spec
-options		TIMEZONE=0, DST=0
-
-#options	DIAGNOSTIC, DEBUG
-options		DDB
-options		FFS
-options		NFSCLIENT
-options		NFSSERVER
-options		SYSVSEM,SYSVMSG,SYSVSHM
-options 	KTRACE
-options 	COMPAT_43
-options 	FIFO
-#options	MFS
-options		DEVPAGER, SWAPPAGER, VNODEPAGER
-#options	MSDOSFS
-
-options		COMPAT_SUNOS
-
-# Networking options
-options		INET
-options		TCP_COMPAT_42	# compatibility with 4.2BSD TCP/IP
-options		GATEWAY		# IP packet forwarding
-#options	ISO		# OSI networking
-#options	TPIP
-#options	EON
-#options	COMPAT_09, COMPAT_10
+option		TIMEZONE=0, DST=0
+
+#option		DIAGNOSTIC, DEBUG
+option		DDB
+option		FFS
+option		NFSCLIENT
+option		NFSSERVER
+option		SYSVSEM,SYSVMSG,SYSVSHM
+option 		KTRACE
+option 		COMPAT_43
+option 		FIFO
+#option		MFS
+option		DEVPAGER, SWAPPAGER, VNODEPAGER
+#option		MSDOSFS
+
+option		COMPAT_SUNOS
+
+# Networking option
+option		INET
+option		TCP_COMPAT_42	# compatibility with 4.2BSD TCP/IP
+option		GATEWAY		# IP packet forwarding
+#option		ISO		# OSI networking
+#option		TPIP
+#option		EON
+#option		COMPAT_09, COMPAT_10
 
 config		bsd	swap generic
 
diff --git a/sys/arch/mvme68k/conf/files.mvme68k b/sys/arch/mvme68k/conf/files.mvme68k
index 983d631a7ec..9393c57375b 100644
--- a/sys/arch/mvme68k/conf/files.mvme68k
+++ b/sys/arch/mvme68k/conf/files.mvme68k
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.mvme68k,v 1.5 1996/05/27 21:48:08 chuck Exp $
+#	$OpenBSD: files.mvme68k,v 1.6 1996/06/30 17:39:44 deraadt Exp $
 
 # config file for mvme68k
 
@@ -104,7 +104,7 @@ file	arch/mvme68k/dev/vmes.c			vmes needs-count
 file	arch/mvme68k/dev/vmel.c			vmel needs-count
 
 device xdc {target = -1}
-attach xdc at vmel
+attach xdc at vmes
 device xd: disk
 attach xd at xdc
 file	arch/mvme68k/dev/xd.c			xd needs-flag