summaryrefslogtreecommitdiff
path: root/sys/arch/mac68k
diff options
context:
space:
mode:
authorgene <gene@cvs.openbsd.org>1997-06-23 02:56:32 +0000
committergene <gene@cvs.openbsd.org>1997-06-23 02:56:32 +0000
commitd6c5394b9c0b12d41a18a4787eb9104c35f05ad6 (patch)
treed8f188a847c3c2c394e77069f0d0c33db7baad03 /sys/arch/mac68k
parent092a1463fa14d25b22bdf9b24d60ab127ebf91bd (diff)
Upon discussion w/ Theo, the only options in std.mac68k that would be of use
would be {DEV,SWAP}PAGER, so std.mac68k is out of here. Update the machine-specific files to reflect this.
Diffstat (limited to 'sys/arch/mac68k')
-rw-r--r--sys/arch/mac68k/conf/PUMA7
-rw-r--r--sys/arch/mac68k/conf/SPOT7
-rw-r--r--sys/arch/mac68k/conf/TIGER7
-rw-r--r--sys/arch/mac68k/conf/std.mac68k15
4 files changed, 12 insertions, 24 deletions
diff --git a/sys/arch/mac68k/conf/PUMA b/sys/arch/mac68k/conf/PUMA
index a5c59f7c2ac..73751a7f269 100644
--- a/sys/arch/mac68k/conf/PUMA
+++ b/sys/arch/mac68k/conf/PUMA
@@ -1,13 +1,14 @@
-# $OpenBSD: PUMA,v 1.13 1997/06/23 02:26:36 gene Exp $
+# $OpenBSD: PUMA,v 1.14 1997/06/23 02:56:29 gene Exp $
# $NetBSD: PUMA,v 1.13 1996/08/05 01:52:15 scottr Exp $
#
# PUMA
-include "arch/mac68k/conf/std.mac68k"
-
+machine mac68k m68k
maxusers 16
option MAXFDESCS=2048
+option SWAPPAGER
+option DEVPAGER
# Filesystem option
option FIFO # POSIX fifo support (in all filesystems)
diff --git a/sys/arch/mac68k/conf/SPOT b/sys/arch/mac68k/conf/SPOT
index 27835df30e3..8ef49364ca3 100644
--- a/sys/arch/mac68k/conf/SPOT
+++ b/sys/arch/mac68k/conf/SPOT
@@ -1,10 +1,9 @@
-# $OpenBSD: SPOT,v 1.12 1997/06/23 02:26:37 gene Exp $
+# $OpenBSD: SPOT,v 1.13 1997/06/23 02:56:30 gene Exp $
# $NetBSD: SPOT,v 1.22 1997/01/20 00:31:42 scottr Exp $
#
# SPOT
-include "arch/mac68k/conf/std.mac68k"
-
+machine mac68k m68k
maxusers 16
makeoptions COPTS="-O2 -m68030"
@@ -12,6 +11,8 @@ makeoptions COPTS="-O2 -m68030"
# Standard system option
option DIAGNOSTIC # DEBUG for extra kernel debugging
option KTRACE # system call tracing support
+option DEVPAGER
+option SWAPPAGER
#option KGDB # support for kernel gdb
#option GDB # support for normal gdb
#option KGDBDEV=0xc01, KGDBRATE=38400 # device & baud rate
diff --git a/sys/arch/mac68k/conf/TIGER b/sys/arch/mac68k/conf/TIGER
index b152f50e7e3..d229eeb44e6 100644
--- a/sys/arch/mac68k/conf/TIGER
+++ b/sys/arch/mac68k/conf/TIGER
@@ -1,10 +1,9 @@
-# $OpenBSD: TIGER,v 1.9 1997/06/23 02:26:38 gene Exp $
+# $OpenBSD: TIGER,v 1.10 1997/06/23 02:56:31 gene Exp $
# $NetBSD: GENERIC,v 1.43 1996/09/22 06:49:09 scottr Exp $
#
# Allen's Q700
-include "arch/mac68k/conf/std.mac68k"
-
+machine mac68k m68k
maxusers 16
makeoptions COPTS="-O2 -m68040"
@@ -12,6 +11,8 @@ makeoptions COPTS="-O2 -m68040"
# Standard system option
option DIAGNOSTIC # DEBUG for extra kernel debugging
option KTRACE # system call tracing support
+option DEVPAGER
+option SWAPPAGER
# Filesystem option
option FIFO # POSIX fifo support (in all filesystems)
diff --git a/sys/arch/mac68k/conf/std.mac68k b/sys/arch/mac68k/conf/std.mac68k
deleted file mode 100644
index cbe84803e1b..00000000000
--- a/sys/arch/mac68k/conf/std.mac68k
+++ /dev/null
@@ -1,15 +0,0 @@
-# $OpenBSD: std.mac68k,v 1.10 1997/06/23 02:26:38 gene Exp $
-# $NetBSD: std.mac68k,v 1.18 1997/02/13 17:29:43 scottr Exp $
-#
-# Standard mac68k information in all kernels.
-
-machine mac68k m68k
-
-# Executable support
-option EXEC_AOUT # a.out binary support
-option EXEC_SCRIPT # shell script support
-
-# Stuff every mac68k should have
-option DEVPAGER # mmap() of devices
-option SWAPPAGER # mmap() of devices
-option HZ=60 # ticks/second of the mac68k RTC