Make it look much more like sys/conf/GENERIC, so when DDB comes

we can just switch to an include.  Use new MDB option.

1 files changed, 78 insertions, 56 deletions

diff --git a/sys/arch/arc/conf/GENERIC b/sys/arch/arc/conf/GENERIC
index 57c1d054877..822017cdc54 100644
--- a/sys/arch/arc/conf/GENERIC
+++ b/sys/arch/arc/conf/GENERIC
@@ -1,63 +1,99 @@
-#	$OpenBSD: GENERIC,v 1.24 1998/01/28 13:46:01 pefo Exp $
+#	$OpenBSD: GENERIC,v 1.25 1998/03/01 19:07:31 niklas Exp $
 #
 #	Generic configuration file for MIPS R4x00 ARC Systems
 #
 
 machine		arc mips
 
-maxusers	32
+# XXX when we have DDB
+#include "../../../conf/GENERIC"
+#	$OpenBSD: GENERIC,v 1.25 1998/03/01 19:07:31 niklas Exp $
+#
+#	Machine-independent option; used by all architectures for their
+#	GENERIC kernel
 
-# Need to set locally
-option		TIMEZONE=0		# minutes west of GMT (for)
-option		DST=0			# use daylight savings rules
+#option		INSECURE	# default to secure
 
-# Standard system options
-option		SWAPPAGER		# swap pager (anonymous and swap space)
-option		DEVPAGER		# device pager (mapped devices)
+option		TIMEZONE=0	# time zone to adjust RTC time by
+option		DST=0		# daylight savings time used by RTC
 
-option		DIAGNOSTIC		# extra kernel debugging checks
-option		KTRACE			# system call tracing support
-option		DEBUG			# extra kernel debugging support
-option		COMPAT_43		# compatibility with 4.3BSD binaries
+option		SWAPPAGER	# paging; REQUIRED
+option		DEVPAGER	# mmap() of devices
+
+#option		DDB		# in-kernel debugger
+#makeoption	DEBUG="-g"	# compile full symbol table
+option		DIAGNOSTIC	# internal consistency checks
+option		KTRACE		# system call tracing, a la ktrace(1)
 
-# System V options
 option		SYSVMSG		# System V-like message queues
 option		SYSVSEM		# System V-like semaphores
 option		SYSVSHM		# System V-like memory sharing
-option		SHMMAXPGS=1024	# 1024 pages is the default
-option		NATIVE_ELF	# Arc systems uses ELF as native format
+#option		SHMMAXPGS=1024	# 1024 pages is the default
+
+option		COMPAT_09	# Kernel compatibility with NetBSD 0.9,
+option		COMPAT_10	# NetBSD 1.0,
+option		COMPAT_11	# NetBSD 1.1,
+option		COMPAT_43	# and 4.3BSD
+#option		TCP_COMPAT_42	# TCP bug compatibility with 4.2BSD
+
+option		LKM		# loadable kernel modules
+
+option		FFS		# UFS
+option		QUOTA		# UFS quotas
+#option		LFS		# log-structured file system
+option		EXT2FS		# Second Extended Filesystem
+option		MFS		# memory file system
+
+
+option		NFSCLIENT	# Network File System client
+option		NFSSERVER	# Network File System server
 
-# Filesystem options
 option		CD9660		# ISO 9660 + Rock Ridge file system
-option		FDESC		# user file descriptor filesystem (/dev/fd)
-option		FIFO		# POSIX fifo support (in all filesystems)
-option		FFS,QUOTA	# fast filesystem with user and group quotas
-option		KERNFS		# kernel data-structure filesystem
-option		MFS		# memory-based filesystem
-option		MSDOSFS		# Ability to read write MS-Dos filsystem
-option		NFSCLIENT	# Sun NFS-compatible filesystem (client)
-option		NFSSERVER	# Sun NFS-compatible filesystem (server)
-option		NULLFS		# null layer filesystem
-option		PORTAL		# portal filesystem (still experimental)
-option		PROCFS          # /proc
-option		UMAPFS		# uid/gid remapping filesystem
-option		UNION           # union file system
-
-
-# Networking options
-#option		GATEWAY		# IP packet forwarding
-option		INET		# Internet protocols
-#option		NS              # XNS
-#option		IPX             # IPX+SPX
-#option		ISO,TPIP	# OSI networking
+option		MSDOSFS		# MS-DOS file system
+option		FDESC		# /dev/fd
+option		FIFO		# FIFOs; RECOMMENDED
+option		KERNFS		# /kern
+option		NULLFS		# loopback file system
+option		PORTAL		# dynamically created filesystem objects
+option		PROCFS		# /proc
+option		UMAPFS		# NULLFS + uid and gid remapping
+option		UNION		# union file system
+
+#option		GATEWAY		# packet forwarding
+option		INET		# IP + ICMP + TCP + UDP
+option		IPSEC		# IPsec
+#option		NS		# XNS
+#option		NSIP		# XNS tunneling over IP
+#option		IPX		# IPX+SPX
+#option		IPXIP		# IPX tunneling over IP
+#option		ISO,TPIP	# OSI
 #option		EON		# OSI tunneling over IP
-#option		CCITT,LLC,HDLC  # X.25
-option		IPFILTER        # IP packet filter for security
+#option		CCITT,LLC,HDLC	# X.25
+option		IPFILTER	# IP packet filter for security
 option		IPFILTER_LOG	# use /dev/ipl to log IPF
+option		PPP_BSDCOMP	# PPP BSD compression
+option		PPP_DEFLATE
+
+pseudo-device	loop	2	# network loopback
+pseudo-device	bpfilter 8	# packet filter
+pseudo-device	sl	2	# CSLIP
+pseudo-device	ppp	2	# PPP
+pseudo-device	tun	2	# network tunneling over tty
+pseudo-device	enc	1	# encryption device
+#pseudo-device	strip	1	# Starmode Radio IP interface
+
+pseudo-device	pty	64	# pseudo-terminals
+pseudo-device	tb	1	# tablet line discipline
+pseudo-device	vnd	4	# paging to files
+pseudo-device	ccd	4	# concatenated disk devices
+
+option		BOOT_CONFIG	# add support for boot -c
+#XXX end of include
+maxusers	32
 
-#option		TCP_COMPAT_42	# compatibility with 4.2BSD TCP/IP
-#option		MULTICAST	# Multicast support
-#option		MROUTING	# Multicast routing support
+# MD options
+option		NATIVE_ELF	# Arc systems uses ELF as native format
+option		MDB		# mini-debugger
 
 # Specify storage configuration (its a joke..)
 config		bsd	swap generic
@@ -127,17 +163,3 @@ cd*		at scsibus? target ? lun ?
 ch*		at scsibus? target ? lun ?
 ss*		at scsibus? target ? lun ?
 uk*		at scsibus? target ? lun ?
-
-#### PSEUDO Devices
-
-pseudo-device	loop		 1	# network loopback
-pseudo-device	bpfilter	 8	# packet filter ports
-pseudo-device	sl		 2	# serial-line IP ports
-pseudo-device	ppp		 2	# serial-line PPP ports
-pseudo-device	tun		 2	# network tunneling over tty
-
-pseudo-device	pty		64	# pseudo ptys
-pseudo-device	tb		 1	# tablet line discipline
-pseudo-device	vnd		 4	# paging to files
-pseudo-device   ccd		 4	# concatenated disk devices
-