Sync with NetBSD 970516. -moj

4 files changed, 32 insertions, 26 deletions

diff --git a/sys/arch/vax/conf/GENERIC b/sys/arch/vax/conf/GENERIC
index 2cc117c5313..285d508aa35 100644
--- a/sys/arch/vax/conf/GENERIC
+++ b/sys/arch/vax/conf/GENERIC
@@ -1,10 +1,10 @@
-#	$OpenBSD: GENERIC,v 1.9 1997/08/30 22:51:54 maja Exp $
-#	$NetBSD: GENERIC,v 1.19 1997/01/11 11:15:38 ragge Exp $
+#	$OpenBSD: GENERIC,v 1.10 1997/09/10 07:34:18 maja Exp $
+#	$NetBSD: GENERIC,v 1.20 1997/01/12 12:38:56 ragge Exp $
 #
 # GENERIC VAX configuration file; all supported devices.
 #
 
-machine	vax
+machine		vax		# machine type
 
 # Here are all different supported CPU types listed.
 option		"VAX8600"
@@ -22,13 +22,15 @@ option		GENERIC
 # Max users on system; this is just a hint
 maxusers	8
 
-# Paging system, we always have them all.
-option		SWAPPAGER, DEVPAGER
+# standard system options
+options		SWAPPAGER	# swap and anonymous memory
+options		VNODEPAGER	# mapped files
+options		DEVPAGER	# mapped devices
 
 # Kernel compiled-in symbolic debugger & system call tracer
 option		DDB
 option		KTRACE
-option		DIAGNOSTIC
+#option		DIAGNOSTIC
 
 # Network support
 #option		GATEWAY
@@ -137,6 +139,7 @@ le0		at vsbus0		# LANCE
 # Terminal lines
 dhu0		at uba? csr 0160440	# DHU-11
 dz0		at uba? csr 0160100	# DZ-11
+dl0		at uba? csr 0176500	# DL-11
 
 pseudo-device   loop	1
 pseudo-device   pty	48
diff --git a/sys/arch/vax/conf/Makefile.vax b/sys/arch/vax/conf/Makefile.vax
index 4167eab268e..b83e9b5c413 100644
--- a/sys/arch/vax/conf/Makefile.vax
+++ b/sys/arch/vax/conf/Makefile.vax
@@ -1,5 +1,5 @@
-#	$OpenBSD: Makefile.vax,v 1.5 1997/01/15 23:24:30 maja Exp $
-#	$NetBSD: Makefile.vax,v 1.28 1996/12/01 06:12:39 jonathan Exp $
+#	$OpenBSD: Makefile.vax,v 1.6 1997/09/10 07:34:19 maja Exp $
+#	$NetBSD: Makefile.vax,v 1.32 1997/03/14 23:27:35 mycroft Exp $
 
 # Makefile for NetBSD
 #
@@ -117,7 +117,8 @@ newvers: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP}
 	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c vers.c
 
 
-clean::
+clean:: cleankernel
+cleankernel:
 	rm -f eddep *bsd bsd.gdb tags *.[io] [a-z]*.s \
 	    [Ee]rrs linterrs makelinks
 
diff --git a/sys/arch/vax/conf/NANCY b/sys/arch/vax/conf/NANCY
index 2982fbb5d88..636a7cf858d 100644
--- a/sys/arch/vax/conf/NANCY
+++ b/sys/arch/vax/conf/NANCY
@@ -1,9 +1,9 @@
-#	$OpenBSD: NANCY,v 1.2 1997/08/30 22:51:55 maja Exp $
+#	$OpenBSD: NANCY,v 1.3 1997/09/10 07:34:20 maja Exp $
 #
 # NANCY MV3600 configuration file.
 #
 
-machine	vax
+machine		vax		# machine type
 
 # Here are all different supported CPU types listed.
 #option		"VAX8600"
@@ -21,8 +21,10 @@ option		"VAX650"	# MV III, 3600, 3800, 3900
 # Max users on system; this is just a hint
 maxusers	8
 
-# Paging system, we always have them all.
-option		SWAPPAGER, DEVPAGER
+# standard system options
+options		SWAPPAGER	# swap and anonymous memory
+options		VNODEPAGER	# mapped files
+options		DEVPAGER	# mapped devices
 
 # Kernel compiled-in symbolic debugger & system call tracer
 option		DDB
@@ -140,6 +142,7 @@ qe0		at uba? csr 0174440	# DEQNA/DELQA
 # Terminal lines
 dhu0		at uba? csr 0160440	# DHU-11
 dz0		at uba? csr 0160100	# DZ-11
+dl0		at uba? csr 0176500     # DL-11
 
 pseudo-device   loop	1
 pseudo-device   pty	48
diff --git a/sys/arch/vax/conf/files.vax b/sys/arch/vax/conf/files.vax
index b9da723e2e9..47a01819acc 100644
--- a/sys/arch/vax/conf/files.vax
+++ b/sys/arch/vax/conf/files.vax
@@ -1,5 +1,5 @@
-#       $OpenBSD: files.vax,v 1.5 1997/05/28 23:08:23 niklas Exp $
-#       $NetBSD: files.vax,v 1.23 1997/01/05 18:50:27 ragge Exp $
+#       $OpenBSD: files.vax,v 1.6 1997/09/10 07:34:21 maja Exp $
+#       $NetBSD: files.vax,v 1.27 1997/03/15 18:11:09 is Exp $
 #
 # new style config file for vax architecture
 #
@@ -76,17 +76,17 @@ file    arch/vax/uba/uda.c		uda | mtc
 
 device	de:ifnet, ether
 attach	de at uba
-file	arch/vax/if/if_de.c		de
+file	arch/vax/if/if_de.c		de needs-flag
 
 # DEQNA/DELQA used on Qbus
 device	qe:ifnet, ether
 attach	qe at uba
-file	arch/vax/if/if_qe.c		qe
+file	arch/vax/if/if_qe.c		qe needs-flag
 
 # DEBNA/DEBNT Ethernet Adapter
 device	ni:ifnet, ether
 attach	ni at bi
-file	arch/vax/bi/ni.c		ni
+file	arch/vax/bi/ni.c		ni needs-flag
 
 # TS11 at UBA
 device	ts
@@ -120,11 +120,6 @@ major	{ sd = 20 }
 major	{ st = 21 }
 major	{ cd = 22 }
 
-# Memory Disk for install floppy
-pseudo-device md
-file	dev/md.c			md needs-flag
-major	{ md = 23 }
-
 # builtin NCR5380 SCSI-controller on VAXstation 
 device	ncr: scsi, ncr5380sbc
 attach	ncr at vsbus
@@ -132,7 +127,7 @@ file	arch/vax/vsa/ncr.c		ncr needs-flag
 
 # LANCE ethernet controller on VAXstation
 attach	le at vsbus
-file	arch/vax/if/if_le.c		le
+file	arch/vax/if/if_le.c		le needs-flag
 
 # DC367-B in VAXstation 2000/3100 (DZ-like 4-port serial line controller,
 # controls keyboard, mouse, modem, and printer/console)
@@ -146,6 +141,9 @@ device	pm
 attach	pm at vsbus
 file	arch/vax/vsa/pm.c		pm needs-flag
 
+device	dl
+attach	dl at uba
+file	arch/vax/uba/dl.c		dl needs-flag
 
 # These devices aren't tested (or even compiled!)
 # They are just included here to make some files happy ;)
@@ -298,10 +296,11 @@ file	arch/vax/uba/dh.c		dh needs-count
 # These are general files needed for compilation.
 file	dev/cons.c
 file	dev/cninit.c
+file	dev/clock_subr.c
 file	arch/vax/vax/locore.c
 file	arch/vax/vax/mem.c
 file	arch/vax/vax/clock.c
-file	arch/vax/vax/gencons.c	vax8600|vax8200|vax780|vax750|vax630|ka650
+file	arch/vax/vax/gencons.c	vax8600|vax8200|vax780|vax750|vax630|vax650
 file	arch/vax/vax/dzcons.c		vax410 | vax43
 file	arch/vax/vax/pmap.c
 file	arch/vax/vax/machdep.c
@@ -316,7 +315,7 @@ file	arch/vax/vax/uvax.c		vax630 | vax410 | vax43
 file	arch/vax/vax/ka630.c		vax630
 file	arch/vax/vax/ka410.c		vax410
 file	arch/vax/vax/ka43.c		vax43
-file	arch/vax/vax/emulate.s		vax630 | ka650
+file	arch/vax/vax/emulate.s		vax630|vax650|vax410|vax420
 file	arch/vax/vax/ka650.c		vax650
 file	arch/vax/vax/conf.c
 file	arch/vax/vax/urem.s