Nuke old COMPAT options. Move MACHINE_NONCONTIG to std.mac68k.

6 files changed, 18 insertions, 33 deletions

diff --git a/sys/arch/mac68k/conf/GENERIC b/sys/arch/mac68k/conf/GENERIC
index 1a466149516..e1634fb6c6f 100644
--- a/sys/arch/mac68k/conf/GENERIC
+++ b/sys/arch/mac68k/conf/GENERIC
@@ -1,5 +1,5 @@
-#	$OpenBSD: GENERIC,v 1.9 1996/09/20 06:45:11 deraadt Exp $
-#	$NetBSD: GENERIC,v 1.38 1996/08/05 01:52:13 scottr Exp $
+#	$OpenBSD: GENERIC,v 1.10 1996/10/14 02:43:50 briggs Exp $
+#	$NetBSD: GENERIC,v 1.43 1996/09/22 06:49:09 scottr Exp $
 #
 # GENERIC
 
@@ -44,7 +44,6 @@ options		GATEWAY		# IP packet forwarding
 #options	ISO		# OSI networking
 #options	TPIP
 #options	EON
-options		COMPAT_42
 options		COMPAT_43
 options		NS
 options		MAPMEM
@@ -59,9 +58,7 @@ options		FPSP
 options		FPU_EMULATE
 options		COMPAT_NOMID
 options		COMPAT_SUNOS
-options		COMPAT_09
-options		COMPAT_10
-options		MACHINE_NONCONTIG
+options		ZS_CONSOLE_ABORT
 
 config		bsd	swap generic
 options		GENERIC
@@ -84,12 +81,12 @@ ncrscsi0	at obio?		# SCSI NCR 5380
 ncr96scsi0	at obio?		# SCSI NCR 53C96
 
 scsibus*	at scsi?
-sd*	at scsibus? target ? lun ?
-st*	at scsibus? target ? lun ?
-cd*	at scsibus? target ? lun ?
-ch*	at scsibus? target ? lun ?
-ss*	at scsibus? target ? lun ?
-uk*	at scsibus? target ? lun ?
+sd*	at scsibus? target ? lun ?	# SCSI disk drives
+st*	at scsibus? target ? lun ?	# SCSI tape drives
+cd*	at scsibus? target ? lun ?	# SCSI CD-ROM drives
+ch*	at scsibus? target ? lun ?	# SCSI autochangers
+ss*	at scsibus? target ? lun ?	# SCSI scanners
+uk*	at scsibus? target ? lun ?	# SCSI unknown
 
 pseudo-device	pty		16
 pseudo-device	bpfilter	12
diff --git a/sys/arch/mac68k/conf/OCELOT b/sys/arch/mac68k/conf/OCELOT
index 5dbb45f2620..0821ee7b4bc 100644
--- a/sys/arch/mac68k/conf/OCELOT
+++ b/sys/arch/mac68k/conf/OCELOT
@@ -1,4 +1,4 @@
-#	$OpenBSD: OCELOT,v 1.8 1996/09/20 06:45:12 deraadt Exp $
+#	$OpenBSD: OCELOT,v 1.9 1996/10/14 02:43:51 briggs Exp $
 #	$NetBSD: OCELOT,v 1.11 1996/08/05 01:52:14 scottr Exp $
 #
 # OCELOT
@@ -33,7 +33,6 @@ options		SCSI
 options		INET
 #options		TCP_COMPAT_42	# compatibility with 4.2BSD TCP/IP
 options		GATEWAY		# IP packet forwarding
-options		COMPAT_42
 options		COMPAT_43
 options		NS
 options		MAPMEM
@@ -42,11 +41,7 @@ options		SYSVSHM,SYSVSEM,SYSVMSG
 # Mac-specific options
 options		M68040
 options		M68030
-options		COMPAT_NOMID
 options		COMPAT_SUNOS
-options		COMPAT_09
-options		COMPAT_10
-options		MACHINE_NONCONTIG
 
 config		bsd	swap generic
 
diff --git a/sys/arch/mac68k/conf/PUMA b/sys/arch/mac68k/conf/PUMA
index 49da3f071d8..92366cbadf8 100644
--- a/sys/arch/mac68k/conf/PUMA
+++ b/sys/arch/mac68k/conf/PUMA
@@ -1,4 +1,4 @@
-#	$OpenBSD: PUMA,v 1.9 1996/09/20 06:45:12 deraadt Exp $
+#	$OpenBSD: PUMA,v 1.10 1996/10/14 02:43:51 briggs Exp $
 #	$NetBSD: PUMA,v 1.13 1996/08/05 01:52:15 scottr Exp $
 #
 # PUMA
@@ -36,7 +36,6 @@ options		SCSI
 options		INET
 #options		TCP_COMPAT_42	# compatibility with 4.2BSD TCP/IP
 options		GATEWAY		# IP packet forwarding
-options		COMPAT_42
 options		COMPAT_43
 options		NS
 options		MAPMEM
@@ -44,11 +43,12 @@ options		SYSVSHM,SYSVSEM,SYSVMSG
 
 # Mac-specific options
 options		M68030
-options		MACHINE_NONCONTIG
-options		COMPAT_NOMID
 options		COMPAT_SUNOS
+options		COMPAT_NOMID
 options		COMPAT_09
 options		COMPAT_10
+options		COMPAT_11
+options		COMPAT_12
 
 config		bsd	root on sd0 swap on sd0 and sd1 and vnd0a dumps on sd1b
 
diff --git a/sys/arch/mac68k/conf/RAMDISK b/sys/arch/mac68k/conf/RAMDISK
index a07ea7a5bb2..e31e00b8422 100644
--- a/sys/arch/mac68k/conf/RAMDISK
+++ b/sys/arch/mac68k/conf/RAMDISK
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK,v 1.7 1996/09/20 06:45:13 deraadt Exp $
+#	$OpenBSD: RAMDISK,v 1.8 1996/10/14 02:43:52 briggs Exp $
 #	$NetBSD: RAMDISK,v 1.6 1996/08/05 01:52:16 scottr Exp $
 
 # RAMDISK
@@ -36,9 +36,6 @@ options		M68030
 options		M68020		# Must have 68851 PMMU
 options		FPSP
 options		FPU_EMULATE
-options		COMPAT_09
-options		COMPAT_10
-options		MACHINE_NONCONTIG
 
 config		bsd	root on rd0a swap on rd0b
 
diff --git a/sys/arch/mac68k/conf/SPOT b/sys/arch/mac68k/conf/SPOT
index 568976afef7..6f36516cce8 100644
--- a/sys/arch/mac68k/conf/SPOT
+++ b/sys/arch/mac68k/conf/SPOT
@@ -1,4 +1,4 @@
-#	$OpenBSD: SPOT,v 1.6 1996/09/20 06:45:13 deraadt Exp $
+#	$OpenBSD: SPOT,v 1.7 1996/10/14 02:43:52 briggs Exp $
 #	$NetBSD: SPOT,v 1.11 1996/08/05 01:52:17 scottr Exp $
 #
 # SPOT
@@ -51,7 +51,6 @@ options		GATEWAY		# IP packet forwarding
 #options	EON
 options		PPP_BSDCOMP
 options		PPP_DEFLATE
-options		COMPAT_42
 options		COMPAT_43
 #options	NS
 options		MAPMEM
@@ -59,11 +58,7 @@ options		SYSVSHM,SYSVSEM,SYSVMSG
 
 # Mac-specific options
 options		M68030
-options		COMPAT_NOMID
 options		COMPAT_SUNOS
-options		COMPAT_09
-options		COMPAT_10
-options		MACHINE_NONCONTIG
 
 config		bsd	swap generic
 options		GENERIC
diff --git a/sys/arch/mac68k/conf/std.mac68k b/sys/arch/mac68k/conf/std.mac68k
index 4dc72b8306b..1e954f03344 100644
--- a/sys/arch/mac68k/conf/std.mac68k
+++ b/sys/arch/mac68k/conf/std.mac68k
@@ -1,4 +1,4 @@
-#	$OpenBSD: std.mac68k,v 1.6 1996/08/10 21:37:42 briggs Exp $
+#	$OpenBSD: std.mac68k,v 1.7 1996/10/14 02:43:53 briggs Exp $
 #	$NetBSD: std.mac68k,v 1.13 1996/08/05 01:00:12 scottr Exp $
 #
 # standard Macintosh information.
@@ -20,3 +20,4 @@ zstty*	at zsc? channel ?
 options	TIMEZONE=0		# minutes west of GMT--read from booter
 options	DST=0			# daylight savings time/summer time
 options	HZ=60			# clock runs at 60hz on this port
+options	MACHINE_NONCONTIG	# Allow 'holes' in physical memory