update from netbsd (without losing local changes)

7 files changed, 85 insertions, 21 deletions

diff --git a/sys/arch/mac68k/conf/GENERIC b/sys/arch/mac68k/conf/GENERIC
index c700ecf7ac1..d2df66a5eba 100644
--- a/sys/arch/mac68k/conf/GENERIC
+++ b/sys/arch/mac68k/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$NetBSD: GENERIC,v 1.31 1995/10/04 11:05:25 briggs Exp $
+#	$NetBSD: GENERIC,v 1.32 1995/11/21 05:00:37 briggs Exp $
 #
 # GENERIC
 
@@ -7,7 +7,7 @@ include	"std.mac68k"
 maxusers	16
 
 # obsolete timezone spec
-options               TIMEZONE=0, DST=1, MAXFDESCS=2048
+options         MAXFDESCS=2048
 
 # Standard system options
 options		SWAPPAGER, VNODEPAGER, DEVPAGER	# paging
diff --git a/sys/arch/mac68k/conf/Makefile.mac68k b/sys/arch/mac68k/conf/Makefile.mac68k
index c960dd25725..16854a80087 100644
--- a/sys/arch/mac68k/conf/Makefile.mac68k
+++ b/sys/arch/mac68k/conf/Makefile.mac68k
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.mac68k,v 1.25 1995/10/10 03:47:59 briggs Exp $
+#	$NetBSD: Makefile.mac68k,v 1.26 1995/11/01 04:53:34 briggs Exp $
 
 # Makefile for NetBSD for the mac
 #	Derived from makefile for hp300 from NetBSD
diff --git a/sys/arch/mac68k/conf/OCELOT b/sys/arch/mac68k/conf/OCELOT
index c3a64f244ce..31dee88e20b 100644
--- a/sys/arch/mac68k/conf/OCELOT
+++ b/sys/arch/mac68k/conf/OCELOT
@@ -1,4 +1,4 @@
-#	$NetBSD: OCELOT,v 1.5 1995/09/16 12:33:07 briggs Exp $
+#	$NetBSD: OCELOT,v 1.6 1995/11/21 05:00:34 briggs Exp $
 #
 # OCELOT
 
@@ -6,9 +6,6 @@ include	"std.mac68k"
 
 maxusers	16
 
-# obsolete timezone spec
-options               TIMEZONE=0, DST=1, MAXFDESCS=2048
-
 # Standard system options
 options		SWAPPAGER, VNODEPAGER, DEVPAGER	# paging
 options		DIAGNOSTIC		# DEBUG for extra kernel debugging
diff --git a/sys/arch/mac68k/conf/PUMA b/sys/arch/mac68k/conf/PUMA
index fe0e10fb870..de8920fac7c 100644
--- a/sys/arch/mac68k/conf/PUMA
+++ b/sys/arch/mac68k/conf/PUMA
@@ -1,4 +1,4 @@
-#	$NetBSD: PUMA,v 1.5.2.1 1995/10/16 14:17:10 briggs Exp $
+#	$NetBSD: PUMA,v 1.7 1995/11/21 05:00:36 briggs Exp $
 #
 # PUMA
 
@@ -6,8 +6,7 @@ include	"std.mac68k"
 
 maxusers	16
 
-# obsolete timezone spec
-options               TIMEZONE=0, DST=1, MAXFDESCS=2048
+options         MAXFDESCS=2048
 
 # Standard system options
 options		SWAPPAGER, VNODEPAGER, DEVPAGER	# paging
@@ -42,11 +41,11 @@ options		SYSVSHM,SYSVSEM,SYSVMSG
 
 # Mac-specific options
 options		M68030		# Includes the 020+851
+options		MACHINE_NONCONTIG
 options		COMPAT_NOMID
 options		COMPAT_SUNOS
 options		COMPAT_09
 options		COMPAT_10
-options		MACHINE_NONCONTIG
 
 config		netbsd	root on sd0 swap on sd0 and sd1 and vnd0a dumps on sd1b
 
@@ -59,9 +58,9 @@ sd*	at scsibus? target ? lun ?
 st*	at scsibus? target ? lun ?
 cd*	at scsibus? target ? lun ?
 
-pseudo-device	loop
 pseudo-device	pty		16
-pseudo-device	sl
-pseudo-device	bpfilter	4
-pseudo-device	ppp
+pseudo-device	bpfilter	16
 pseudo-device	vnd		4
+pseudo-device	loop
+pseudo-device	ppp
+pseudo-device	sl
diff --git a/sys/arch/mac68k/conf/RAMDISK b/sys/arch/mac68k/conf/RAMDISK
new file mode 100644
index 00000000000..f900026d620
--- /dev/null
+++ b/sys/arch/mac68k/conf/RAMDISK
@@ -0,0 +1,58 @@
+#	$NetBSD: RAMDISK,v 1.1 1995/11/21 05:02:02 briggs Exp $
+
+# RAMDISK
+# Support Root/swap on ramdisk
+#
+
+include	"std.mac68k"
+
+maxusers	2
+
+# Enable the hooks used for initializing the ram-disk
+options		RAMDISK_HOOKS
+options		MINIROOTSIZE=512	# 256K
+
+# Standard system options
+options		SWAPPAGER, VNODEPAGER, DEVPAGER	# paging
+
+# Filesystem options
+options		FIFO		# POSIX fifo support (in all filesystems)
+options		DDB
+options		FFS
+options		NFSCLIENT	# Sun NFS-compatible filesystem
+options		CD9660		# ISO-9660 w/ RockRidge
+options		KERNFS		# Kernel filesystem
+
+options		SCSI
+
+# Networking options
+options		INET
+options		TCP_COMPAT_42	# compatibility with 4.2BSD TCP/IP
+
+# Mac-specific options
+options		M68040
+options		M68030		# Includes the 020+851
+options		FPSP
+options		FPU_EMULATE
+options		COMPAT_09
+options		COMPAT_10
+options		MACHINE_NONCONTIG
+
+config		netbsd	root on rd0a swap on rd0b
+
+rd0 at mainbus?
+
+ae*	at nubus0	slot -1   id ?   claimed 0
+
+ncrscsi0	at mainbus?		# SCSI NCR 5380
+ncr96scsi0	at mainbus?		# 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 ?
+
+pseudo-device	ppp
+pseudo-device	sl
+pseudo-device	loop
diff --git a/sys/arch/mac68k/conf/files.mac68k b/sys/arch/mac68k/conf/files.mac68k
index f750fee0ea3..2ef138cb726 100644
--- a/sys/arch/mac68k/conf/files.mac68k
+++ b/sys/arch/mac68k/conf/files.mac68k
@@ -1,4 +1,4 @@
-#	$NetBSD: files.mac68k,v 1.35 1995/09/03 03:37:32 briggs Exp $
+#	$NetBSD: files.mac68k,v 1.37 1995/11/21 05:06:28 briggs Exp $
 
 # mac68k-specific configuration info
 
@@ -37,9 +37,6 @@ device	ae at nubus: ifnet, ether
 file	arch/mac68k/dev/if_ae.c		ae needs-flag
 
 include "../../../scsi/files.scsi"
-major	{sd = 4}
-major	{st = 5}
-major	{cd = 6}
 
 device	ncrscsi at mainbus: scsi
 file	arch/mac68k/dev/mac68k5380.c	ncrscsi needs-flag
@@ -48,7 +45,8 @@ device	ncr96scsi at mainbus: scsi
 file	arch/mac68k/dev/scsi96.c	ncr96scsi needs-flag
 
 file	arch/m68k/m68k/copy.s
-file	arch/m68k/fpe/fpu_emulate.c		fpu_emulate
+include "../../m68k/fpe/files.fpe"
+
 file	arch/mac68k/mac68k/autoconf.c
 file	arch/mac68k/mac68k/clock.c
 file	arch/mac68k/mac68k/disksubr.c		disk
@@ -68,7 +66,16 @@ file	arch/mac68k/mac68k/vm_machdep.c
 file	dev/cons.c
 file	dev/cninit.c
 
+# RAM Disk for installs
+device	rd at mainbus
+file	dev/ramdisk.c			rd needs-count
+file	arch/mac68k/dev/rd_root.c	ramdisk_hooks
+
+major	{sd = 4}
+major	{st = 5}
+major	{cd = 6}
 major	{vnd = 8}
+major	{rd = 13}
 
 # Compatibility modules
 
diff --git a/sys/arch/mac68k/conf/std.mac68k b/sys/arch/mac68k/conf/std.mac68k
index 9423fd9fb36..a7e356de495 100644
--- a/sys/arch/mac68k/conf/std.mac68k
+++ b/sys/arch/mac68k/conf/std.mac68k
@@ -1,4 +1,4 @@
-#	$NetBSD: std.mac68k,v 1.6.2.1 1995/10/14 22:26:46 briggs Exp $
+#	$NetBSD: std.mac68k,v 1.8 1995/11/21 05:05:51 briggs Exp $
 #
 # standard Macintosh information.
 # roughly copied from std.sparc 14 Oct 1993.
@@ -18,3 +18,6 @@ asc0	at mainbus0
 ser0	at mainbus0
 grf0	at nubus0	slot -1 id ? claimed 0
 grf1	at nubus0	slot -1 id ? claimed 0
+
+options	TIMEZONE=0		# minutes west of GMT--read from booter
+options	DST=0			# daylight savings rules--obsolete