Merge of Late July NetBSD + s/options/option/

2 files changed, 150 insertions, 147 deletions

diff --git a/sys/arch/amiga/conf/COFFEE b/sys/arch/amiga/conf/COFFEE
index 572918db724..5b2dce38f63 100644
--- a/sys/arch/amiga/conf/COFFEE
+++ b/sys/arch/amiga/conf/COFFEE
@@ -1,3 +1,4 @@
+#	$OpenBSD: COFFEE,v 1.4 1996/08/19 00:28:45 niklas Exp $
 #	$NetBSD: COFFEE,v 1.12 1995/10/09 02:08:35 chopps Exp $
 
 #
@@ -9,129 +10,129 @@
 include "std.amiga"
 
 maxusers	8
-options		TIMEZONE=300, DST=1
+option		TIMEZONE=300, DST=1
 
 #
 # processors this kernel should support
 #
-options		"M68040"	# support for 040
-options		FPSP		# MC68040 floating point support
-options		"M68030"	# support for 030
-options		"M68020"	# support for 020/851
-options		FPCOPROC	# Support for MC6888[12] (Required)
+option		"M68040"	# support for 040
+option		FPSP		# MC68040 floating point support
+option		"M68030"	# support for 030
+option		"M68020"	# support for 020/851
+option		FPCOPROC	# Support for MC6888[12] (Required)
 
-options		SWAPPAGER	# Pager for processes (Required)
-options		VNODEPAGER	# Pager for vnodes (Required)
-options		DEVPAGER	# Pager for devices (Required)
+option		SWAPPAGER	# Pager for processes (Required)
+option		VNODEPAGER	# Pager for vnodes (Required)
+option		DEVPAGER	# Pager for devices (Required)
 
 #
 # Networking options
 #
-options		INET		# IP networking support (Required)
-#options	ISO		# ISO Networking support
-#options	TPIP		# ARGO TP networking support
-#options	CCITT		# CCITT X.25
-#options	NS		# Xerox XNS
-#options	EON		# ISO CLNL over IP
-options		GATEWAY		# Packet forwarding
-#options	DIRECTED_BROADCAST	# Broadcast across subnets
-#options	NSIP		# XNS over IP
+option		INET		# IP networking support (Required)
+#option		ISO		# ISO Networking support
+#option		TPIP		# ARGO TP networking support
+#option		CCITT		# CCITT X.25
+#option		NS		# Xerox XNS
+#option		EON		# ISO CLNL over IP
+option		GATEWAY		# Packet forwarding
+#option		DIRECTED_BROADCAST	# Broadcast across subnets
+#option		NSIP		# XNS over IP
 
 #
 # File system related options
 #
-options		QUOTA		# Disk quotas for local disks
-options		NFSSERVER	# Network File System server side code
-options		NFSCLIENT	# Network File System client side code
+option		QUOTA		# Disk quotas for local disks
+option		NFSSERVER	# Network File System server side code
+option		NFSCLIENT	# Network File System client side code
 
 #
 # File systems
 #
-options		FFS		# Berkeley fast file system
-options		MFS		# Memory based filesystem
-options		PROCFS		# Process filesystem
-options		KERNFS		# Kernel parameter filesystem (Recommended)
-options		FDESC		# /dev/fd filesystem
-options		NULLFS		# Loopback filesystem
-options		FIFO		# FIFO operations on vnodes (Recommended)
-options		ADOSFS		# AmigaDOS file system
-options		"CD9660"	# ISO 9660 file system, with Rock Ridge
-options		UNION           # union file system
-options		UMAPFS          # uid/gid remapping filesystem
-#options	PORTAL		# Portal filesystem
-#options	MSDOSFS		# MS-DOS filesystem
+option		FFS		# Berkeley fast file system
+option		MFS		# Memory based filesystem
+option		PROCFS		# Process filesystem
+option		KERNFS		# Kernel parameter filesystem (Recommended)
+option		FDESC		# /dev/fd filesystem
+option		NULLFS		# Loopback filesystem
+option		FIFO		# FIFO operations on vnodes (Recommended)
+option		ADOSFS		# AmigaDOS file system
+option		"CD9660"	# ISO 9660 file system, with Rock Ridge
+option		UNION		# union file system
+option		UMAPFS		# uid/gid remapping filesystem
+#option		PORTAL		# Portal filesystem
+#option		MSDOSFS		# MS-DOS filesystem
 
 
 #
 # Compatability options for various existing systems
 #
-options		"COMPAT_10"	# compatability with older NetBSD release
-options		"COMPAT_09"	# compatability with older NetBSD release
-options		"COMPAT_43"	# 4.3 BSD compatible system calls
-options		COMPAT_SUNOS	# Support to run Sun (m68k) executables
-options		"TCP_COMPAT_42"	# Use 4.2 BSD style TCP
-options		"COMPAT_NOMID"	# allow nonvalid machine id executables
-#options	COMPAT_HPUX	# HP300 compatability
+option		"COMPAT_10"	# compatability with older NetBSD release
+option		"COMPAT_09"	# compatability with older NetBSD release
+option		"COMPAT_43"	# 4.3 BSD compatible system calls
+option		COMPAT_SUNOS	# Support to run Sun (m68k) executables
+option		"TCP_COMPAT_42"	# Use 4.2 BSD style TCP
+option		"COMPAT_NOMID"	# allow nonvalid machine id executables
+#option		COMPAT_HPUX	# HP300 compatability
 
 #
 # Support for System V IPC facilities.
 #
-options		SYSVSHM		# System V-like shared memory
-options		SYSVMSG		# System V-like messages
-options		SYSVSEM		# System V-like semaphores
+option		SYSVSHM		# System V-like shared memory
+option		SYSVMSG		# System V-like messages
+option		SYSVSEM		# System V-like semaphores
 
 #
 # Support for various kernel options
 #
-options		GENERIC		# Mini-root boot support
-options		LKM		# Loadable kernel modules
-options		KTRACE		# Add kernel tracing system call
-options		DIAGNOSTIC	# Add additional error checking code
-options		"NKMEMCLUSTERS=256"	# Size of kernel malloc area
+option		GENERIC		# Mini-root boot support
+option		LKM		# Loadable kernel modules
+option		KTRACE		# Add kernel tracing system call
+option		DIAGNOSTIC	# Add additional error checking code
+option		"NKMEMCLUSTERS=256"	# Size of kernel malloc area
 
 #
 # Misc. debuging options
 #
-options		PANICWAIT	# Require keystroke to dump/reboot
-options		DEBUG		# Add debugging statements
-options		DDB		# Kernel debugger
-#options	SYSCALL_DEBUG	# debug all syscalls.
-#options	SCSIDEBUG	# Add SCSI debugging statements
-#options	KGDB		# Kernel debugger (KGDB) support
-#options	PANICBUTTON	# Forced crash via keypress (???)
+option		PANICWAIT	# Require keystroke to dump/reboot
+option		DEBUG		# Add debugging statements
+option		DDB		# Kernel debugger
+#option		SYSCALL_DEBUG	# debug all syscalls.
+#option		SCSIDEBUG	# Add SCSI debugging statements
+#option		KGDB		# Kernel debugger (KGDB) support
+#option		PANICBUTTON	# Forced crash via keypress (???)
 
 #
 # Amiga specific options
 #
-options		MACHINE_NONCONTIG # Non-contiguous memory support
+option		MACHINE_NONCONTIG # Non-contiguous memory support
 
-options		RETINACONSOLE	# enable code to allow retina to be console
-options		ULOWELLCONSOLE	# enable code to allow a2410 to be console
-options         CL5426CONSOLE   # Cirrus console
+option		RETINACONSOLE	# enable code to allow retina to be console
+option		ULOWELLCONSOLE	# enable code to allow a2410 to be console
+option		CL5426CONSOLE   # Cirrus console
 
-options		GRF_ECS		# Enhanced Chip Set
-options		GRF_NTSC	# NTSC
-options		GRF_PAL		# PAL
-options		"GRF_A2024"	# Support for the A2024
-options		GRF_AGA		# AGA Chip Set
-options		GRF_CL5426	# Cirrus board support
-#options	"KFONT_8X11"	# 8x11 font
+option		GRF_ECS		# Enhanced Chip Set
+option		GRF_NTSC	# NTSC
+option		GRF_PAL		# PAL
+option		"GRF_A2024"	# Support for the A2024
+option		GRF_AGA		# AGA Chip Set
+option		GRF_CL5426	# Cirrus board support
+#option		"KFONT_8X11"	# 8x11 font
 
 # This is how you would tell the kernel the A2410 oscillator frequencies:
 # The used frequencies are the defaults, and don't need option setting
-#options	"ULOWELL_OSC1=36000000"
-#options	"ULOWELL_OSC2=66667000"
+#option		"ULOWELL_OSC1=36000000"
+#option		"ULOWELL_OSC2=66667000"
 
 # This is how you specify the blitting speed, higher values may speed up blits
 # a littel bit.  If you raise this value too much some trash may appear.
 # the commented version is the default.
-#options	RH_MEMCLK 61000000
+#option		RH_MEMCLK 61000000
 # this option enables the 64 bit sprite which doesn't seems to be work
 # for quite a few people.  E.g. The cursor sprite will turn to a block
 # when moved to the top of the screen in X.
-#options	RH_64BIT_SPRITE
+#option		RH_64BIT_SPRITE
 # enables fast scroll code appears to now work on 040 systems.
-#options	RETINA_SPEED_HACK
+#option		RETINA_SPEED_HACK
 
 grfcc0		at mainbus0		# custom chips
 grfrt0		at zbus0		# retina II
diff --git a/sys/arch/amiga/conf/DRACO b/sys/arch/amiga/conf/DRACO
index dc617290496..4d1da50128b 100644
--- a/sys/arch/amiga/conf/DRACO
+++ b/sys/arch/amiga/conf/DRACO
@@ -1,146 +1,147 @@
-#	$NetBSD: DRACO,v 1.2 1996/05/16 17:52:22 is Exp $
+#	$NetBSD: DRACO,v 1.2.4.1 1996/05/30 21:25:55 is Exp $
 
 #
-# Macro System GmbH "DraCo"
+# Macro System GmbH "DraCo", currently 68060-only until FPE is integrated.
 #
 
-# look into this later.
+# this will be replace by std.amiga soon:
 include "std.draco"
 
 maxusers	8
-options		TIMEZONE=300, DST=1
+option		TIMEZONE=300, DST=1
 
+#
 # mainboards to support (in addition to Amiga)
-options		DRACO
+#
+option		DRACO
+
 #
 # processors this kernel should support
 #
-options		"M68060"	# support for 060 might still need M68040.
-options		"M68040"	# support for 040
-options		M060SP		# MC68060 software support (Required)
-options		FPSP		# MC68040 floating point support
-options		FPCOPROC	# Support for MC6888[12] (Required)
 
-options		SWAPPAGER	# Pager for processes (Required)
-options		VNODEPAGER	# Pager for vnodes (Required)
-options		DEVPAGER	# Pager for devices (Required)
+option		"M68060"	# support for 060
+option		"M060SP"	# MC68060 software support (Required for 060)
+option		FPCOPROC	# Support for MC6888[12] (Required)
+
+#
+# pagers:
+#
+
+option		SWAPPAGER	# Pager for processes (Required)
+option		VNODEPAGER	# Pager for vnodes (Required)
+option		DEVPAGER	# Pager for devices (Required)
 
 #
 # Networking options
 #
-options		INET		# IP networking support (Required)
-#options	ISO		# ISO Networking support
-#options	TPIP		# ARGO TP networking support
-#options	CCITT		# CCITT X.25
-#options	NS		# Xerox XNS
-#options	EON		# ISO CLNL over IP
-#options	GATEWAY		# Packet forwarding
-#options	DIRECTED_BROADCAST	# Broadcast across subnets
-#options	NSIP		# XNS over IP
+option		INET		# IP networking support (Required)
+#option		ISO		# ISO Networking support
+#option		TPIP		# ARGO TP networking support
+#option		CCITT		# CCITT X.25
+#option		NS		# Xerox XNS
+#option		EON		# ISO CLNL over IP
+#option		GATEWAY		# Packet forwarding
+#option		DIRECTED_BROADCAST	# Broadcast across subnets
+#option		NSIP		# XNS over IP
 
 #
 # File system related options
 #
-options		QUOTA		# Disk quotas for local disks
-options		NFSSERVER	# Network File System server side code
-options		NFSCLIENT	# Network File System client side code
+option		QUOTA		# Disk quotas for local disks
+option		NFSSERVER	# Network File System server side code
+option		NFSCLIENT	# Network File System client side code
 
 #
 # File systems
 #
-options		FFS		# Berkeley fast file system
-options		MFS		# Memory based filesystem
-options		PROCFS		# Process filesystem
-options		KERNFS		# Kernel parameter filesystem (Recommended)
-options		FDESC		# /dev/fd filesystem
-options		NULLFS		# Loopback filesystem
-options		FIFO		# FIFO operations on vnodes (Recommended)
-options		ADOSFS		# AmigaDOS file system
-options		"CD9660"	# ISO 9660 file system, with Rock Ridge
-#options	PORTAL		# Portal filesystem
-options		MSDOSFS		# MS-DOS filesystem
+option		FFS		# Berkeley fast file system
+option		MFS		# Memory based filesystem
+option		PROCFS		# Process filesystem
+option		KERNFS		# Kernel parameter filesystem (Recommended)
+option		FDESC		# /dev/fd filesystem
+option		NULLFS		# Loopback filesystem
+option		FIFO		# FIFO operations on vnodes (Recommended)
+option		ADOSFS		# AmigaDOS file system
+option		"CD9660"	# ISO 9660 file system, with Rock Ridge
+#option		PORTAL		# Portal filesystem
+option		MSDOSFS		# MS-DOS filesystem
 
 
 #
 # Compatability options for various existing systems
 #
-#options	"COMPAT_10"	# compatability with older NetBSD release
-#options	COMPAT_SUNOS	# Support to run Sun (m68k) executables
-options		"TCP_COMPAT_42"	# Use 4.2 BSD style TCP
-options		"COMPAT_NOMID"	# allow nonvalid machine id executables
-#options	COMPAT_HPUX	# HP300 compatability
+#option		"COMPAT_10"	# compatability with older NetBSD release
+#option		COMPAT_SUNOS	# Support to run Sun (m68k) executables
+option		"TCP_COMPAT_42"	# Use 4.2 BSD style TCP
+option		"COMPAT_NOMID"	# allow nonvalid machine id executables
+#option		COMPAT_HPUX	# HP300 compatability
 
 #
 # Support for System V IPC facilities.
 #
-options		SYSVSHM		# System V-like shared memory
-options		SYSVMSG		# System V-like messages
-options		SYSVSEM		# System V-like semaphores
+option		SYSVSHM		# System V-like shared memory
+option		SYSVMSG		# System V-like messages
+option		SYSVSEM		# System V-like semaphores
 
 #
 # Support for various kernel options
 #
-options		GENERIC		# Mini-root boot support
-options		LKM		# Loadable kernel modules
-options		KTRACE		# Add kernel tracing system call
-options		DIAGNOSTIC	# Add additional error checking code
-options		"NKMEMCLUSTERS=256"	# Size of kernel malloc area
+option		GENERIC		# Mini-root boot support
+option		LKM		# Loadable kernel modules
+option		KTRACE		# Add kernel tracing system call
+option		DIAGNOSTIC	# Add additional error checking code
+option		"NKMEMCLUSTERS=256"	# Size of kernel malloc area
 
 #
 # Misc. debuging options
 #
-options		PANICWAIT	# Require keystroke to dump/reboot
-options		DEBUG		# Add debugging statements
-options		DDB		# Kernel debugger
-#options	SYSCALL_DEBUG	# debug all syscalls.
-#options	SCSIDEBUG	# Add SCSI debugging statements
-#options	KGDB		# Kernel debugger (KGDB) support
-#options	PANICBUTTON	# Forced crash via keypress (???)
+option		PANICWAIT	# Require keystroke to dump/reboot
+option		DEBUG		# Add debugging statements
+option		DDB		# Kernel debugger
+#option		SYSCALL_DEBUG	# debug all syscalls.
+#option		SCSIDEBUG	# Add SCSI debugging statements
+#option		KGDB		# Kernel debugger (KGDB) support
+#option		PANICBUTTON	# Forced crash via keypress (???)
 
 #
 # Amiga specific options
 #
-options		MACHINE_NONCONTIG # Non-contiguous memory support 
+option		MACHINE_NONCONTIG # Non-contiguous memory support 
 				  # higly recommended for DraCo
 
-options		RETINACONSOLE	# enable code to allow retina to be console
+option		RETINACONSOLE	# enable code to allow retina to be console
 
-#options		"KFONT_8X11"	# 8x11 font
+#option		"KFONT_8X11"	# 8x11 font
 
 # This is how you specify the blitting speed, higher values may speed up blits
 # a littel bit.  If you raise this value too much some trash may appear.
 # the commented version is the default.
-#options	RH_MEMCLK 61000000
+#option		RH_MEMCLK 61000000
 # this option enables the 64 bit sprite which doesn't seems to be work
 # for quite a few people.  E.g. The cursor sprite will turn to a block
 # when moved to the top of the screen in X.
-#options	RH_64BIT_SPRITE
+#option		RH_64BIT_SPRITE
 # enables fast scroll code appears to now work on 040 systems.
-#options	RETINA_SPEED_HACK
+#option		RETINA_SPEED_HACK
 
 grfrh0		at zbus0		# Altais looks just like the Retina Z3
-grful0		at zbus0		# A2410, for poor ZZA
-
 grf2		at grfrh0
-grf4		at grful0
-
 ite2		at grf2			# terminal emulators for grf's
-ite4		at grf4			# terminal emulators for grf's
 
-#msc0		at zbus0		# A2232 MSC multiport serial.
-#mfc0		at zbus0		# MultiFaceCard I/O board
-#mfcs0		at mfc0 unit 0		# MFC serial
-#mfcs1		at mfc0 unit 1		# MFC serial
+msc0		at zbus0		# A2232 MSC multiport serial.
+mfc0		at zbus0		# MultiFaceCard I/O board
+mfcs0		at mfc0 unit 0		# MFC serial
+mfcs1		at mfc0 unit 1		# MFC serial
 #mfcp0		at mfc0 unit 0		# MFC parallel [not available yet]
 #mfc1		at zbus0		# MultiFaceCard 2nd I/O board
 #mfcs2		at mfc1 unit 0
 #mfcs3		at mfc1 unit 1
 #mfcp1		at mfc1 unit 0
 
-#le0		at zbus0		# Lance ethernet.
-#ed0		at zbus0		# dp8390 ethernet
-#es0		at zbus0		# SMC 91C90 ethernet
-#qn0		at zbus0		# quicknet ethernet
+le0		at zbus0		# Lance ethernet.
+ed0		at zbus0		# dp8390 ethernet
+es0		at zbus0		# SMC 91C90 ethernet
+qn0		at zbus0		# quicknet ethernet
 ae0		at zbus0		# Ariadne ethernet
 bah*		at zbus0		# C= arcnet
 
@@ -153,6 +154,7 @@ scsibus*	at drsc0
 # will configure to the next available sd unit number
 sd*	at scsibus? target ? lun ?	# scsi disks
 st*	at scsibus? target ? lun ?	# scsi tapes
+ss*	at scsibus? target ? lun ?	# scsi scanner
 cd*	at scsibus? target ? lun ?	# scsi cd's
 
 pseudo-device	pty 16			# pseudo terminals