Replace siop devices with ssh.

Include ../../../conf/GENERIC in non-GENERIC configurations. Remove XT,
which is no more different from GENERIC then.

5 files changed, 41 insertions, 413 deletions

diff --git a/sys/arch/mvme88k/conf/GENERIC b/sys/arch/mvme88k/conf/GENERIC
index 78900b81b55..ad30cfa3005 100644
--- a/sys/arch/mvme88k/conf/GENERIC
+++ b/sys/arch/mvme88k/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.14 2001/02/12 08:16:20 smurph Exp $
+#	$OpenBSD: GENERIC,v 1.15 2001/03/07 02:00:08 miod Exp $
 
 machine		mvme88k 
 
@@ -39,7 +39,7 @@ sclock0	at pcctwo0 ipl 5
 nvram0	at pcctwo0 offset 0xc0000
 vme0	at pcctwo0 offset 0x40000
 ie0	at pcctwo0 offset 0x46000 ipl 1
-siop0	at pcctwo0 offset 0x47000 ipl 2
+ssh0	at pcctwo0 offset 0x47000 ipl 2
 cl0	at pcctwo0 offset 0x45000 ipl 3
 #lptwo0	at pcctwo0 addr 0xfff45000 ipl 1 size
 memc0	at pcctwo0 offset 0x43000
@@ -74,8 +74,8 @@ vs5	at vmes0 addr 0xffff7800 ipl 2 vec 0x8a len 0x800
 # ------------------------------ svme0 devices -------------------------
 scsibus* at vs?
 
-# ------------------------------ siop0 devices -------------------------
-scsibus* at siop?
+# ------------------------------ ssh0 devices --------------------------
+scsibus* at ssh?
 
 # ------------------------------ scsibus0 devices ----------------------
 sd*	at scsibus? target ? lun ?
diff --git a/sys/arch/mvme88k/conf/M187 b/sys/arch/mvme88k/conf/M187
index 21a60b19ad4..b38cd45e7d1 100644
--- a/sys/arch/mvme88k/conf/M187
+++ b/sys/arch/mvme88k/conf/M187
@@ -1,76 +1,19 @@
-#	$OpenBSD: M187,v 1.6 2001/01/14 20:25:22 smurph Exp $
+#	$OpenBSD: M187,v 1.7 2001/03/07 02:00:08 miod Exp $
 
 machine mvme88k
 
-maxusers 64
-
-option		TIMEZONE=300, DST=1
-
-# processors this kernel should support
+include "../../../conf/GENERIC"
 
 option		"M88000"	# support for 88K
 option		MVME187		# support for 187
-option		"NCPUS=1"	# Number of cpus supported (max 4)
 option		UVM		# use the UVM virtual memory system
-
+option		FFS_SOFTUPDATES	# Soft Updates
+option		"NCPUS=1"	# Number of cpus supported (max 4)
 option		BUGMAP		# use Bug Rom VME Mappings
 
-option		SWAPPAGER	# Pager for processes (Required)
-option		VNODEPAGER	# Pager for vnodes (Required)
-option		DEVPAGER	# Pager for devices (Required)
-
-option		SYSVSHM
-option		SYSVSEM
-option		SYSVMSG
-
-# File system related options
-
-#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
-
-option		FFS		# Berkeley fast file system
-option		MFS		# Memory based filesystem
-option		FIFO		# FIFO operations on vnodes (Recommended)
-option		CD9660		# ISO 9660 + Rock Ridge file system
-#option		MSDOSFS		# MS-DOS file system
-option		FDESC		# /dev/fd
-option		KERNFS		# /kern
-option		NULLFS		# loopback file system
-#option		PORTAL		# ?
-option		PROCFS		# /proc
-#option		UMAPFS		# NULLFS + uid and gid remapping
-#option		UNION		# union file system
-
-# Networking options
-
-option		NTP		# hooks supporting the Network Time Protocol
-option		IPFILTER	# IP packet filter for security
-option		IPFILTER_LOG	# use /dev/ipl to log IPF
-option		INET
-option		GATEWAY		# IP packet forwarding
-#option		TCP_COMPAT_42	# compatibility with 4.2BSD TCP/IP
-#option		ISO		# OSI networking
-#option		TPIP
-#option		EON
-#option		COMPAT_43
-#option		EXEC_COFF
-#option		LKM
-
-# Support for various kernel options
-
-#option		DIAGNOSTIC	# Add additional error checking code
-#option		"NKMEMCLUSTERS=512"	# Size of kernel malloc area
-
-# Misc. debuging options
+maxusers 64
 
-option		PANICWAIT	# Require keystroke to dump/reboot
-#option		DEBUG		# Add debugging statements
-option		DDB		# Kernel debugger
-#option		SYSCALL_DEBUG	# debug all syscalls.
-#option		KTRACE		# debug all syscalls.
+config	bsd swap on generic
 
 # ------------------------------ devices --------------------------------
 mainbus0 at root
@@ -85,7 +28,7 @@ sclock0	at pcctwo0 ipl 5
 vme0	at pcctwo0 offset 0x40000
 nvram0	at pcctwo0 offset 0xc0000
 ie0	at pcctwo0 offset 0x46000 ipl 1
-siop0	at pcctwo0 offset 0x47000 ipl 2
+ssh0	at pcctwo0 offset 0x47000 ipl 2
 cl0	at pcctwo0 offset 0x45000 ipl 3
 #lptwo0	at pcctwo0 addr 0xfff45000 ipl 1 size
 #memc0	at pcctwo0 addr 0xfff43000
@@ -113,8 +56,8 @@ vs5	at vmes0 addr 0xffff7800 ipl 2 len 0x800
 # ------------------------------ svme0 devices -------------------------
 scsibus* at vs?
 
-# ------------------------------ siop0 devices -------------------------
-scsibus* at siop?
+# ------------------------------ ssh0 devices --------------------------
+scsibus* at ssh?
 
 # ------------------------------ scsibus0 devices ----------------------
 sd*	at scsibus? target ? lun ?
@@ -122,16 +65,7 @@ st*	at scsibus? target ? lun ?
 cd*	at scsibus? target ? lun ?
 
 # ------------------------------ pseudo devices ------------------------
-pseudo-device	vnd	4	# paging to files
-pseudo-device	bpfilter 8	# packet filter
-pseudo-device	sl 	2	# CSLIP
-pseudo-device	tun	2	# network tunneling over tty
-pseudo-device	ppp 	2	# PPP
-pseudo-device	pty	64	# pseudo-terminals
-pseudo-device	loop	2	# network loopback
-pseudo-device	tb	1	# tablet line discipline
-pseudo-device	enc	1	# encryption device
-pseudo-device	ccd	4	# concatenated disk devices
-pseudo-device	rd 	2	# ram disk drives
-
-config	bsd swap on generic
+pseudo-device	rd 	2
+# for IPv6
+pseudo-device	gif	4
+#pseudo-device	faith	1
diff --git a/sys/arch/mvme88k/conf/M188 b/sys/arch/mvme88k/conf/M188
index 0b14e82fb05..34d7ae9ff48 100644
--- a/sys/arch/mvme88k/conf/M188
+++ b/sys/arch/mvme88k/conf/M188
@@ -1,98 +1,21 @@
-#	$OpenBSD: M188,v 1.3 2001/02/12 08:16:21 smurph Exp $
+#	$OpenBSD: M188,v 1.4 2001/03/07 02:00:08 miod Exp $
 
 machine mvme88k
 
-maxusers 64
+include "../../../conf/GENERIC"
 
 # processors this kernel should support
 
 option		"M88000"	# support for 88K
 option		MVME188		# support for 187
-option		"NCPUS=1"	# Number of cpus supported (max 4)
 option		UVM		# use the UVM virtual memory system
-
+option		FFS_SOFTUPDATES	# Soft Updates
+option		"NCPUS=1"	# Number of cpus supported (max 4)
 option		BUGMAP		# use Bug Rom VME Mappings
 
-#option		INSECURE	# default to secure
-
-option		TIMEZONE=0	# time zone to adjust RTC time by
-option		DST=0		# daylight savings time used by RTC
-option		NTP		# hooks supporting the Network Time Protocol
-
-option		SWAPPAGER	# paging; REQUIRED
-option		DEVPAGER	# mmap() of devices
-
-option		DDB		# in-kernel debugger
-#option		DDB_SAFE_CONSOLE # allow break into ddb during boot
-#makeoptions	DEBUG="-g"	# compile full symbol table
-#makeoptions	PROF="-pg"	# build profiled kernel
-#option		GPROF		# kernel profiling, kgmon(8)
-option		DIAGNOSTIC	# internal consistency checks
-option		KTRACE		# system call tracing, a la ktrace(1)
-option		KMEMSTATS	# collect malloc(9) statistics
-
-option		CRYPTO		# Cryptographic framework
-
-option		SYSVMSG		# System V-like message queues
-option		SYSVSEM		# System V-like semaphores
-option		SYSVSHM		# System V-like memory sharing
-
-option		UVM_SWAP_ENCRYPT# support encryption of pages going to swap
-
-#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		XFS		# xfs filesystem
-
-option		TCP_SACK	# Selective Acknowledgements for TCP
-#option		TCP_FACK	# Forward Acknowledgements for TCP
-#option		TCP_SIGNATURE	# TCP MD5 Signatures, for BGP routing sessions
-
-option		NFSCLIENT	# Network File System client
-option		NFSSERVER	# Network File System server
-
-option		CD9660		# ISO 9660 + Rock Ridge file system
-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		INET6		# IPv6 (needs INET)
-option		PULLDOWN_TEST	# use m_pulldown for IPv6 packet parsing
-option		IPSEC		# IPsec
-#option		KEY		# PF_KEY (implied by 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		NETATALK	# AppleTalk
-#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
-#option		MROUTING	# Multicast router
-#option		BOOT_CONFIG	# add support for boot -c
+maxusers 64
 
+config	bsd swap on generic
 
 # ------------------------------ devices --------------------------------
 mainbus0 at root
@@ -136,24 +59,7 @@ st*	at scsibus? target ? lun ?
 cd*	at scsibus? target ? lun ?
 
 # ------------------------------ pseudo devices ------------------------
-pseudo-device	rd 	2	# ram disk drives
-
-pseudo-device	loop	2	# network loopback
-pseudo-device	bpfilter 8	# packet filter
-pseudo-device	sl	2	# CSLIP
-pseudo-device	ppp	2	# PPP
-pseudo-device	sppp		# Sync PPP/HDLC
-pseudo-device	tun	2	# network tunneling over tty
-pseudo-device	enc	1	# IPSEC needs the encapsulation interface
-#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
-pseudo-device	ksyms	1	# kernel symbols device
-pseudo-device	bridge	2	# network bridging support
-#pseudo-device	vlan 	2	# IEEE 802.1Q VLAN 
-pseudo-device	gre	1	# GRE encapsulation interface
-
-config	bsd swap on generic
+pseudo-device	rd 	2
+# for IPv6
+pseudo-device	gif	4
+#pseudo-device	faith	1
diff --git a/sys/arch/mvme88k/conf/M197 b/sys/arch/mvme88k/conf/M197
index 9db01a62996..7eaa468c02c 100644
--- a/sys/arch/mvme88k/conf/M197
+++ b/sys/arch/mvme88k/conf/M197
@@ -1,73 +1,20 @@
-#	$OpenBSD: M197,v 1.1 1999/09/27 21:21:15 smurph Exp $
+#	$OpenBSD: M197,v 1.2 2001/03/07 02:00:08 miod Exp $
 
 machine mvme88k
 
-maxusers 64
-
-option		TIMEZONE=300, DST=1
+include "../../../conf/GENERIC"
 
 # processors this kernel should support
 
 option		"M88000"	# support for 88K
 option 		MVME197		# support for 197
+option		UVM
+option		FFS_SOFTUPDATES	# Soft Updates
 option		BUGMAP		# use Bug Rom VME Mappings
 
-option		SWAPPAGER	# Pager for processes (Required)
-option		VNODEPAGER	# Pager for vnodes (Required)
-option		DEVPAGER	# Pager for devices (Required)
-
-option		SYSVSHM
-option		SYSVSEM
-option		SYSVMSG
-
-# File system related options
-
-#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
-
-option		FFS		# Berkeley fast file system
-option		MFS		# Memory based filesystem
-option		FIFO		# FIFO operations on vnodes (Recommended)
-option		CD9660		# ISO 9660 + Rock Ridge file system
-#option		MSDOSFS		# MS-DOS file system
-option		FDESC		# /dev/fd
-option		KERNFS		# /kern
-option		NULLFS		# loopback file system
-#option		PORTAL		# ?
-option		PROCFS		# /proc
-#option		UMAPFS		# NULLFS + uid and gid remapping
-option		UNION		# union file system
-
-# Networking options
-
-option		NTP		# hooks supporting the Network Time Protocol
-option		IPFILTER	# IP packet filter for security
-option		IPFILTER_LOG	# use /dev/ipl to log IPF
-option		INET
-option		GATEWAY		# IP packet forwarding
-#option		TCP_COMPAT_42	# compatibility with 4.2BSD TCP/IP
-#option		ISO		# OSI networking
-#option		TPIP
-#option		EON
-#option		COMPAT_43
-#option		EXEC_COFF
-#option		LKM
-
-# Support for various kernel options
-
-#option		DIAGNOSTIC	# Add additional error checking code
-#option		"NKMEMCLUSTERS=512"	# Size of kernel malloc area
-
-# Misc. debuging options
-
-option		PANICWAIT	# Require keystroke to dump/reboot
-#option		DEBUG		# Add debugging statements
-option		DDB		# Kernel debugger
-#option		SYSCALL_DEBUG	# debug all syscalls.
-option		KTRACE		# debug all syscalls.
+maxusers 64
+
+config	bsd swap on generic
 
 # ------------------------------ devices --------------------------------
 mainbus0 at root
@@ -85,7 +32,7 @@ sclock0	at pcctwo0 ipl 5
 vme0	at pcctwo0 offset 0x40000
 nvram0	at pcctwo0 offset 0xc0000
 ie0	at pcctwo0 offset 0x46000 ipl 1
-siop0	at pcctwo0 offset 0x47000 ipl 2
+ssh0	at pcctwo0 offset 0x47000 ipl 2
 cl0	at pcctwo0 offset 0x45000 ipl 3
 #lptwo0	at pcctwo0 addr 0xfff45000 ipl 1 size
 #memc0	at pcctwo0 addr 0xfff43000
@@ -113,8 +60,8 @@ vs5	at vmes0 addr 0xffff7800 ipl 2 vec 0x8a len 0x800
 # ------------------------------ svme0 devices -------------------------
 scsibus* at vs?
 
-# ------------------------------ siop0 devices -------------------------
-scsibus* at siop?
+# ------------------------------ ssh0 devices --------------------------
+scsibus* at ssh?
 
 # ------------------------------ scsibus? devices ----------------------
 sd*	at scsibus? target ? lun ?
@@ -122,16 +69,7 @@ st*	at scsibus? target ? lun ?
 cd*	at scsibus? target ? lun ?
 
 # ------------------------------ pseudo devices ------------------------
-pseudo-device	vnd	4	# paging to files
-pseudo-device	bpfilter 8	# packet filter
-pseudo-device	sl 	2	# CSLIP
-pseudo-device	tun	2	# network tunneling over tty
-pseudo-device	ppp 	2	# PPP
-pseudo-device	pty	64	# pseudo-terminals
-pseudo-device	loop	2	# network loopback
-pseudo-device	tb	1	# tablet line discipline
-pseudo-device	enc	1	# encryption device
-pseudo-device	ccd	4	# concatenated disk devices
-pseudo-device	rd 	2	# ram disk drives
-
-config	bsd swap on generic
+pseudo-device	rd 	2
+# for IPv6
+pseudo-device	gif	4
+pseudo-device	faith	1
diff --git a/sys/arch/mvme88k/conf/XT b/sys/arch/mvme88k/conf/XT
deleted file mode 100644
index e471a4119a0..00000000000
--- a/sys/arch/mvme88k/conf/XT
+++ /dev/null
@@ -1,150 +0,0 @@
-#	$OpenBSD: XT,v 1.3 1999/09/27 21:30:11 smurph Exp $
-
-machine mvme88k
-
-maxusers 64
-
-option		TIMEZONE=300, DST=1
-
-# processors this kernel should support
-
-option		"M88000"	# support for 88K
-option		MVME187		# support for 187
-option		MVME188		# support for 188
-option		MVME197		# support for 197
-option		"NCPUS=1"	# Number of cpus supported (max 4)
-
-option		BUGMAP		# use Bug Rom VME Mappings
-
-option		SWAPPAGER	# Pager for processes (Required)
-option		VNODEPAGER	# Pager for vnodes (Required)
-option		DEVPAGER	# Pager for devices (Required)
-
-option		SYSVSHM
-option		SYSVSEM
-option		SYSVMSG
-
-# File system related options
-
-#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
-
-option		FFS		# Berkeley fast file system
-option		MFS		# Memory based filesystem
-option		FIFO		# FIFO operations on vnodes (Recommended)
-option		CD9660		# ISO 9660 + Rock Ridge file system
-#option		MSDOSFS		# MS-DOS file system
-option		FDESC		# /dev/fd
-option		KERNFS		# /kern
-option		NULLFS		# loopback file system
-#option		PORTAL		# ?
-option		PROCFS		# /proc
-#option		UMAPFS		# NULLFS + uid and gid remapping
-#option		UNION		# union file system
-
-# Networking options
-
-option		NTP		# hooks supporting the Network Time Protocol
-option		IPFILTER	# IP packet filter for security
-option		IPFILTER_LOG	# use /dev/ipl to log IPF
-option		INET
-option		GATEWAY		# IP packet forwarding
-#option		TCP_COMPAT_42	# compatibility with 4.2BSD TCP/IP
-#option		ISO		# OSI networking
-#option		TPIP
-#option		EON
-#option		COMPAT_43
-#option		EXEC_COFF
-#option		LKM
-
-# Support for various kernel options
-
-#option		DIAGNOSTIC	# Add additional error checking code
-#option		"NKMEMCLUSTERS=512"	# Size of kernel malloc area
-
-# Misc. debuging options
-
-option		PANICWAIT	# Require keystroke to dump/reboot
-#option		DEBUG		# Add debugging statements
-option		DDB		# Kernel debugger
-#option		SYSCALL_DEBUG	# debug all syscalls.
-#option		KTRACE		# debug all syscalls.
-
-# ------------------------------ devices --------------------------------
-mainbus0 at root
-
-# ------------------------------ mainbus devices ------------------------
-bugtty0 at mainbus0
-busswitch0 at mainbus0 addr 0xfff00000
-pcctwo0 at mainbus0 addr 0xfff00000
-syscon0 at mainbus0 addr 0xfff00000
-
-# ----------------------------- busswicth devices -----------------------
-pcctwo0 at busswitch0 offset 0x42000
-
-# ------------------------------ pcctwo devices -------------------------
-clock0	at pcctwo0 ipl 5
-sclock0	at pcctwo0 ipl 5
-vme0	at pcctwo0 offset 0x40000
-nvram0	at pcctwo0 offset 0xc0000
-ie0	at pcctwo0 offset 0x46000 ipl 1
-siop0	at pcctwo0 offset 0x47000 ipl 2
-cl0	at pcctwo0 offset 0x45000 ipl 3
-#lptwo0	at pcctwo0 addr 0xfff45000 ipl 1 size
-#memc0	at pcctwo0 addr 0xfff43000
-#memc1	at pcctwo0 addr 0xfff43100
-
-# ------------------------------ syscon0 devices ------------------------
-clock0	at syscon0 ipl 5
-sclock0	at syscon0 ipl 5
-nvram0	at syscon0 offset 0x80000
-dart0	at syscon0 offset 0x82000 ipl 3
-vme0	at syscon0 offset 0x85000
-
-# ------------------------------ vme0 devices --------------------------
-vmes0	at vme0
-vmel0	at vme0
-
-# ------------------------------ vmes0 devices -------------------------
-vx0	at vmes0 addr 0xff780000 ipl 3 vec 0x70 len 0x10000
-vx1	at vmes0 addr 0xff790000 ipl 3 vec 0x71	len 0x10000
-vx2	at vmes0 addr 0xff7a0000 ipl 3 vec 0x72 len 0x10000
-vx3	at vmes0 addr 0xff7b0000 ipl 3 vec 0x73 len 0x10000
-ve0	at vmes0 addr 0xffff1200 ipl 3 vec 0x74 len 0x100
-ve1	at vmes0 addr 0xffff1400 ipl 3 vec 0x75 len 0x100
-ve2	at vmes0 addr 0xffff1600 ipl 3 vec 0x76 len 0x100
-vs0	at vmes0 addr 0xffff9000 ipl 2 vec 0x80 len 0x800
-vs1	at vmes0 addr 0xffff9800 ipl 2 vec 0x82 len 0x800
-vs2	at vmes0 addr 0xffff4800 ipl 2 vec 0x84 len 0x800
-vs3	at vmes0 addr 0xffff5800 ipl 2 vec 0x86 len 0x800
-vs4	at vmes0 addr 0xffff7000 ipl 2 vec 0x88 len 0x800
-vs5	at vmes0 addr 0xffff7800 ipl 2 vec 0x8a len 0x800
-
-# ------------------------------ svme0 devices -------------------------
-scsibus* at vs?
-
-# ------------------------------ siop0 devices -------------------------
-scsibus* at siop?
-
-# ------------------------------ scsibus? devices ----------------------
-sd*	at scsibus? target ? lun ?
-st*	at scsibus? target ? lun ?
-cd*	at scsibus? target ? lun ?
-
-# ------------------------------ pseudo devices ------------------------
-pseudo-device	vnd	4	# paging to files
-pseudo-device	bpfilter 8	# packet filter
-pseudo-device	sl 	2	# CSLIP
-pseudo-device	tun	2	# network tunneling over tty
-pseudo-device	ppp 	2	# PPP
-pseudo-device	pty	64	# pseudo-terminals
-pseudo-device	loop	2	# network loopback
-pseudo-device	tb	1	# tablet line discipline
-#pseudo-device	enc	1	# encryption device
-pseudo-device	ccd	4	# concatenated disk devices
-pseudo-device	rd 	2	# ram disk drives
-
-config	bsd swap on generic