Merge new config(8) support from NetBSD, by Jason Thorpe.

Also add siginfo glue, BOOT_CONFIG, and various other changes.

1 files changed, 72 insertions, 67 deletions

diff --git a/sys/arch/hp300/conf/DISKLESS b/sys/arch/hp300/conf/DISKLESS
index 24cd82c4969..48a3d07f338 100644
--- a/sys/arch/hp300/conf/DISKLESS
+++ b/sys/arch/hp300/conf/DISKLESS
@@ -1,87 +1,92 @@
-#	$OpenBSD: DISKLESS,v 1.8 1997/01/12 15:12:13 downsj Exp $
-#	$NetBSD: DISKLESS,v 1.11 1996/12/11 09:10:38 thorpej Exp $
+#	$OpenBSD: DISKLESS,v 1.9 1997/02/03 04:47:05 downsj Exp $
+#	$NetBSD: GENERIC,v 1.23 1997/01/31 06:12:57 thorpej Exp $
 #
-# Diskless HP 9000/300-series workstation.
+# Generic kernel - one size fits all.
 #
-machine		"hp300"
-
-cpu             "HP320"
-cpu             "HP330"         # includes 318, 319
-cpu             "HP340"
-cpu             "HP350"
-cpu		"HP360"
-cpu		"HP370"
-cpu		"HP375"		# includes 345, 400t, 400s
-cpu		"HP380"		# includes 425t, 425s, 433s
-ident		DISKLESS
+
+# Include attributes common to all hp300s
+include "arch/hp300/conf/std.hp300"
+
+# Include all GENERIC option	
+include "../../../conf/GENERIC"
+
+# Support for various CPU types
+option	 	HP320
+option	 	HP330		# includes 318, 319
+option	 	HP340
+option	 	HP350
+option	 	HP360
+option	 	HP370
+option	 	HP375		# includes 345, 400t, 400s
+option	 	HP380		# includes 425t, 425s, 433s
 
 # Need to set locally
-timezone	8 dst
 maxusers	8
 
-# Standard system options
-options		SWAPPAGER		# swap pager (anonymous and swap space)
-options		DEVPAGER		# device pager (mapped devices)
-options         "COMPAT_43"             # compatibility with 4.3BSD interfaces
-options         "COMPAT_44"             # compatibility with 4.4BSD binaries
-options         "COMPAT_09"             # compatibility with NetBSD 0.9
-options		"COMPAT_10"		# compatibility with NetBSD 1.0
-options		COMPAT_M68K4K		# NetBSD compatibility
-options         SYSVSHM                 # System V-style shared memory
-options         SYSVSEM                 # System V-style semaphores
-options         SYSVMSG                 # System V-style message queues
-options         KTRACE                  # system call tracing support
-options		"NKMEMCLUSTERS=1024"	# # 4K pages in kernel malloc pool
-
-# Filesystem options
-options		FIFO		# POSIX fifo support (in all filesystems)
-options		NFSCLIENT	# Network filesystem client
-options		UNION		# Union filesystem (req. for FDESC)
-options		KERNFS		# kernel data-structure filesystem
-options		FDESC		# user file descriptor filesystem
-options		PROCFS		# /proc filesystem
-options		MFS		# Memory-based filesystem
-
-# Networking options
-options		INET		# Internet protocols
-#options		"TCP_COMPAT_42"	# compatibility with 4.2BSD TCP/IP
-options		NMBCLUSTERS="512"	# Just a little extra
-
 # Options for HP hardware
-options		FPSP		# floating point interface for 68040
-options		USELEDS		# make the lights twinkle
-#options	PANICBUTTON	# two fast <reset>s on HIL dump kernel
-options		UK_KEYBOARD	# include United Kingdom HIL keymap
-options		SE_KEYBOARD	# include Swedish HIL keymap
+option	 	FPSP		# floating point interface for 68040
+option	 	USELEDS		# make the lights twinkle
+option	 	COMPAT_NOLABEL	# defaults for unlabeled disks
+#option		PANICBUTTON	# two fast <reset>s on HIL dump kernel
+#option		CONSCODE="9"	# force console at this select code
+option	 	UK_KEYBOARD	# include United Kingdom HIL keymap
+option	 	SE_KEYBOARD	# include Swedish HIL keymap
+
+# This option enables a different copyin/copyout that uses page
+# mapping for large copies.
+#option	 	MAPPEDCOPY	# different copyin/copyout for large copies
 
 #
 # HP-UX binary compatibility.
 # NOTE: THIS IS STILL VERY EXPERIMENTAL.  YOUR MILEAGE MAY VARY.
 #
-options	COMPAT_HPUX		# HP-UX binary compatibility
+option	 	COMPAT_HPUX	# HP-UX binary compatibility
+
+option	 	COMPAT_M68K4K	# compat. with NetBSD/m68k4k binaries
+
+# Verbose descriptions of unconfigured DIO devices
+# (Warning: this compiles in a large string table)
+option	 	DIOVERBOSE	# recognize "unknown" DIO devices
+
+config		bsd swap generic
+
+mainbus0	at root		# root "bus"
+
+intio0		at mainbus0	# internal i/o space
+dio0		at mainbus0	# DIO/DIO-II bus
+
+# Davinci framebuffer
+dvbox*		at intio?
+dvbox*		at dio? scode ?
+
+# Gatorbox framebuffer
+gbox*		at intio?
+gbox*		at dio? scode ?
 
-#options 	"COMPAT_M68K4K"	# compat. with NetBSD/m68k4k binaries
+# Hyperion framebuffer
+hyper*		at dio? scode ?
 
-# Debugging options
-options		DDB		# Kernel Dynamic Debugger
+# Renaissance framebuffer
+rbox*		at intio?
+rbox*		at dio? scode ?
 
-config		bsd swap nfs
+# Topcat/catseye framebuffers
+topcat*		at intio?
+topcat*		at dio? scode ?
 
-device		dca0	at scode9 flags 1
-device		dca1	at scode? flags 1
+# Framebuffer abstraction
+grf*		at dvbox?
+grf*		at gbox?
+grf*		at hyper?
+grf*		at rbox?
+grf*		at topcat?
 
-device		dcm0	at scode? flags 0xe
-device		dcm1	at scode? flags 0xe
+# Internal Terminal Emulator
+ite*		at grf?
 
-device		le0	at scode?
-device		le1	at scode?
+dca0		at dio? scode 9	flags 1	  # DCA serial interfaces
+dca*		at dio? scode ?
 
-device		grf0	at scode?
-device		grf1	at scode?
+dcm*		at dio? scode ?	flags 0xe # DCM 4- or 8-port serial interfaces
 
-pseudo-device	pty		64	# pseudo ptys
-pseudo-device	bpfilter	16	# Berkeley packet filter
-pseudo-device	vnd		4	# vnode pseudo-disks
-pseudo-device	ite			# terminal emulation on grf
-pseudo-device	loop			# loopback network interface
-pseudo-device	ether			# basic ethernet support
+le*		at dio? scode ?		# LANCE ethernet interfaces