Remove some old, out of date kernel configurations.

Add HZ=60 to GENERIC and GENERICSBC configurations.  Make sure clockreg.h
does not compile unless HZ is defined.  We can't just define it here since
param.c needs to agree with whatever clockreg.h uses.  This has been broken
since June.  Only effect is that the clocks would lose time badly.

6 files changed, 5 insertions, 279 deletions

diff --git a/sys/arch/mac68k/conf/GENERIC b/sys/arch/mac68k/conf/GENERIC
index 1a406cfc16f..6cf9b1dd07e 100644
--- a/sys/arch/mac68k/conf/GENERIC
+++ b/sys/arch/mac68k/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.22 1997/06/23 02:26:35 gene Exp $
+#	$OpenBSD: GENERIC,v 1.23 1997/10/19 23:40:44 briggs Exp $
 #	$NetBSD: GENERIC,v 1.52 1997/01/13 23:34:07 scottr Exp $
 #
 # GENERIC - an all-in-one kernel for the mac68k
@@ -7,6 +7,7 @@ machine	mac68k m68k
 include "conf/GENERIC"
 
 # Mac-specific options
+option		HZ=60		# Macs like 60hz
 option		M68040
 option		M68030
 option		M68020		# Must have 68851 PMMU
diff --git a/sys/arch/mac68k/conf/GENERICSBC b/sys/arch/mac68k/conf/GENERICSBC
index 24eea01a79c..3ed9ee21bc0 100644
--- a/sys/arch/mac68k/conf/GENERICSBC
+++ b/sys/arch/mac68k/conf/GENERICSBC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERICSBC,v 1.8 1997/06/23 02:26:36 gene Exp $
+#	$OpenBSD: GENERICSBC,v 1.9 1997/10/19 23:40:44 briggs Exp $
 #	$NetBSD: GENERIC,v 1.52 1997/01/13 23:34:07 scottr Exp $
 #
 # GENERICSBC --- our generic kernel using the SBC SCSI driver
@@ -7,6 +7,7 @@ machine	mac68k m68k
 include "conf/GENERIC"
 
 # Mac-specific options
+option		HZ=60		# Macs like 60hz
 option		M68040
 option		M68030
 option		M68020		# Must have 68851 PMMU
diff --git a/sys/arch/mac68k/conf/PUMA b/sys/arch/mac68k/conf/PUMA
deleted file mode 100644
index 73751a7f269..00000000000
--- a/sys/arch/mac68k/conf/PUMA
+++ /dev/null
@@ -1,90 +0,0 @@
-#	$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
-
-machine		mac68k m68k
-maxusers	16
-
-option         MAXFDESCS=2048
-option		SWAPPAGER
-option		DEVPAGER
-
-# Filesystem option
-option		FIFO		# POSIX fifo support (in all filesystems)
-option		KTRACE
-option		DDB
-
-option		FFS
-option		MFS		# memory-based filesystem
-option		NFSSERVER	# Sun NFS-compatible filesystem
-option		NFSCLIENT	# Sun NFS-compatible filesystem
-option		NULLFS		# Null (formerly loop-back) filesystem
-option		UNION		# Union filesystem
-option		CD9660		# ISO-9660 w/ RockRidge
-option		KERNFS		# kernel data-structure filesystem
-option		FDESC		# user file descriptor filesystem
-option		PROCFS		# Process filesystem
-
-option		LKM		# Loadable Kernel Modules
-
-option		SCSI
-
-# Networking option
-option		INET
-#option		TCP_COMPAT_42	# compatibility with 4.2BSD TCP/IP
-option		GATEWAY		# IP packet forwarding
-option		COMPAT_43
-option		NS
-option		MAPMEM
-option		SYSVSHM,SYSVSEM,SYSVMSG
-
-# Mac-specific option
-option		M68030
-option		COMPAT_SUNOS
-option		COMPAT_NOMID
-option		COMPAT_09
-option		COMPAT_10
-option		COMPAT_11
-option		COMPAT_12
-
-config		bsd	root on sd0 swap on sd0 and sd1 and vnd0a dumps on sd1b
-
-mainbus0 at root
-
-fpu0 at mainbus?
-
-# on-board I/O
-obio0 at mainbus?
-
-adb0  at obio?
-zsc0  at obio?
-zstty*        at zsc? channel ?
-nubus0		at mainbus?
-
-ae*		at nubus?
-macvid*		at nubus?
-
-grf*		at macvid?
-
-# Attach ite semantics to the appropriate grf device
-ite0		at grf?
-
-ncrscsi0	at obio?		# SCSI NCR 5380
-
-scsibus*	at scsi?
-sd*	at scsibus? target ? lun ?
-st*	at scsibus? target ? lun ?
-cd*	at scsibus? target ? lun ?
-
-pseudo-device	pty		16
-pseudo-device	bpfilter	16
-pseudo-device	vnd		4
-pseudo-device	loop
-pseudo-device	ppp
-pseudo-device	sl
-
-# Puma-specific option
-
-# Try linked commands on all targets
-option		TRY_SCSI_LINKED_COMMANDS=0x7f
diff --git a/sys/arch/mac68k/conf/SPOT b/sys/arch/mac68k/conf/SPOT
deleted file mode 100644
index 8ef49364ca3..00000000000
--- a/sys/arch/mac68k/conf/SPOT
+++ /dev/null
@@ -1,85 +0,0 @@
-#	$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
-
-machine		mac68k m68k
-maxusers	16
-
-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
-option		UCONSOLE		# non-root can grab console
-
-# Filesystem option
-option		FIFO		# POSIX fifo support (in all filesystems)
-option		DDB
-option		FFS
-option		QUOTA		# fast filesystem with user and group quotas
-option		MFS		# memory-based filesystem
-option		NFSSERVER	# Sun NFS-compatible filesystem
-option		NFSCLIENT	# Sun NFS-compatible filesystem
-option		CD9660		# ISO-9660 w/ RockRidge
-option		KERNFS		# kernel data-structure filesystem
-option		FDESC		# user file descriptor filesystem
-option		PROCFS		# Process filesystem
-
-option		SCSI
-
-# Networking option
-option		INET
-option		TCP_COMPAT_42	# compatibility with 4.2BSD TCP/IP
-option		GATEWAY		# IP packet forwarding
-option		PPP_BSDCOMP
-option		PPP_DEFLATE
-option		COMPAT_42
-option		COMPAT_43
-option		MAPMEM
-option		SYSVSHM,SYSVSEM,SYSVMSG
-
-# Mac-specific option
-option		M68030
-
-# SPOT-specific option
-option		RTC_OFFSET=360	# hardware clock is this many mins. west of GMT
-
-config		bsd	swap generic
-option		GENERIC
-
-mainbus0 at root
-
-fpu0 at mainbus?
-
-# on-board I/O
-obio0 at mainbus?
-
-adb0  at obio?
-zsc0  at obio?
-zstty*        at zsc? channel ?
-nubus0		at mainbus?
-
-ae*		at nubus?
-
-macvid*		at nubus?
-grf*		at macvid?
-ite0		at grf?
-
-sbc0		at obio? flags 0x1	# MI NCR 5380 SCSI Bus Controller
-
-scsibus*	at scsi?
-sd*		at scsibus? target ? lun ?
-st*		at scsibus? target ? lun ?
-cd*		at scsibus? target ? lun ?
-
-pseudo-device	pty		32
-pseudo-device	bpfilter	16
-pseudo-device	vnd		2
-pseudo-device	ppp		2
-pseudo-device	loop
diff --git a/sys/arch/mac68k/conf/TIGER b/sys/arch/mac68k/conf/TIGER
deleted file mode 100644
index 9b265478ddc..00000000000
--- a/sys/arch/mac68k/conf/TIGER
+++ /dev/null
@@ -1,98 +0,0 @@
-#	$OpenBSD: TIGER,v 1.11 1997/06/23 19:05:41 kstailey Exp $
-#	$NetBSD: GENERIC,v 1.43 1996/09/22 06:49:09 scottr Exp $
-#
-# Allen's Q700
-
-machine		mac68k m68k
-maxusers	16
-
-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)
-option		DDB
-option		FFS
-option		QUOTA		# fast filesystem with user and group quotas
-option		MFS		# memory-based filesystem
-option		NFSSERVER	# Sun NFS-compatible filesystem
-option		NFSCLIENT	# Sun NFS-compatible filesystem
-option		NULLFS		# Null (formerly loop-back) filesystem
-option		CD9660		# ISO-9660 w/ RockRidge
-option		KERNFS		# kernel data-structure filesystem
-option		FDESC		# user file descriptor filesystem
-option		PROCFS		# Process filesystem
-
-option		LKM		# loadable kernel modules
-
-option		SCSI
-
-# Networking option
-option		INET
-option		GATEWAY		# IP packet forwarding
-option		IPFILTER
-option		IPFILTER_LOG	# use /dev/ipl to log IPF
-option		COMPAT_43
-option		MAPMEM
-option		SYSVSHM,SYSVSEM,SYSVMSG
-option		PPP_BSDCOMP,PPP_DEFLATE
-
-# Mac-specific option
-option		HWDIRECT
-option		M68040
-option		FPSP
-option		COMPAT_NOMID
-option		COMPAT_SUNOS
-option		ZS_CONSOLE_ABORT
-
-config		bsd	swap generic
-option		GENERIC
-
-mainbus0 at root
-
-fpu0 at mainbus?
-
-# on-board I/O
-obio0 at mainbus?
-
-adb0  at obio?
-zsc0  at obio?
-zstty*        at zsc? channel ?
-sn*		at obio?	# SONIC ethernet (68040)
-
-# no internal video, but need interrupts, etc.
-intvid*		at obio?
-
-nubus0		at mainbus?
-
-ae*		at nubus?
-macvid*		at nubus?
-
-# grf should be on nubus card
-grf*		at macvid?
-
-# Attach ite semantics to the appropriate grf device
-ite0		at grf?
-
-esp0		at obio?		# SCSI NCR 53C9x
-
-scsibus*	at scsi?
-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
-pseudo-device	vnd		2
-pseudo-device	ccd		2
-pseudo-device	ppp		2
-pseudo-device	random		1
-pseudo-device	loop
diff --git a/sys/arch/mac68k/mac68k/clockreg.h b/sys/arch/mac68k/mac68k/clockreg.h
index 88107c0104c..9b1b1fcf872 100644
--- a/sys/arch/mac68k/mac68k/clockreg.h
+++ b/sys/arch/mac68k/mac68k/clockreg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: clockreg.h,v 1.5 1997/06/26 22:00:55 gene Exp $	*/
+/*	$OpenBSD: clockreg.h,v 1.6 1997/10/19 23:40:46 briggs Exp $	*/
 /*	$NetBSD: clockreg.h,v 1.5 1996/04/01 05:16:52 scottr Exp $	*/
 
 /*-
@@ -40,9 +40,6 @@
  */
 
 
-#ifndef HZ
-#define	HZ		60		/* Seems to be universal for mac68k */
-#endif
 #define CLK_SPEED	0.0000012766	/* time to complete a clock (3 MHz) */
 
 /*