Commint for the first real mvme88k OpendBSD

8 files changed, 244 insertions, 450 deletions

diff --git a/sys/arch/mvme88k/conf/GENERIC b/sys/arch/mvme88k/conf/GENERIC
index 959af6779af..51b4d91c961 100644
--- a/sys/arch/mvme88k/conf/GENERIC
+++ b/sys/arch/mvme88k/conf/GENERIC
@@ -1,100 +1,44 @@
-#
-# This configuration file contains all possible options
-#
+#	$OpenBSD: GENERIC,v 1.7 1998/12/15 06:02:54 smurph Exp $
 
-machine m88k
+machine		mvme88k 
 
-options		TIMEZONE=300, DST=1
+include "../../../conf/GENERIC"
 
-#
-# processors this kernel should support
-#
 options		"M88000"	# support for 88K
 options		MVME187		# support for 187
 
-options		SWAPPAGER	# Pager for processes (Required)
-options		VNODEPAGER	# Pager for vnodes (Required)
-options		DEVPAGER	# Pager for devices (Required)
-
-#
-# Networking options
-#
-
-#
-# 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
-
-#
-# File systems
-#
-options		FFS		# Berkeley fast file system
-options		MFS		# Memory based filesystem
-options		FIFO		# FIFO operations on vnodes (Recommended)
-
-#
-# Compatability options for various existing systems
-#
-#options		"COMPAT_43"	# 4.3 BSD compatible system calls
-#options		"TCP_COMPAT_42"	# Use 4.2 BSD style TCP
-#options		"COMPAT_NOMID"	# allow nonvalid machine id executables
-
-#
-# Support for System V IPC facilities.
-#
-
-#
-# Support for various kernel options
-#
-options		GENERIC		# Mini-root boot support
-options		DIAGNOSTIC	# Add additional error checking code
-options		"NKMEMCLUSTERS=256"	# Size of kernel malloc area
+maxusers	64
 
-#
-# 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.
+config		bsd		swap generic
 
 #
 # devices
 #
 mainbus0 at root
-# mainbus devices
-#sram0	at mainbus0 addr 0xffe00000
-vme0	at mainbus0 addr 0xfff40000
-pcctwo0 at mainbus0 addr 0xfff42000
-# pcctwo devices
-clock0	at pcctwo0 addr 0xfff42000 ipl 5
-nvram0	at pcctwo0 addr 0xfffc0000 size 0x10000
-#ie0	at pcctwo0 addr 0xfff46000 ipl 1 size
-#siop0	at pcctwo0 addr 0xfff47000 ipl 2 #size
-cl0	at pcctwo0 addr 0xfff45000 ipl 3 size 0x512
-#lptwo0	at pcctwo0 addr 0xfff45000 ipl 1 size
-#mcecc0	at pcctwo0 addr 0xfff43000
-#mcecc1	at pcctwo0 addr 0xfff43100
-#memc0	at pcctwo0 addr 0xfff43000
-#memc1	at pcctwo0 addr 0xfff43100
-
+# ------------------------------ mainbus devices ------------------------
 #bugtty0 at mainbus0
-
-#vme0 devices
+sram0	at mainbus0 addr 0xffe00000
+pcctwo0 at mainbus0 addr 0xfff00000
+# ------------------------------ pcctwo devices -------------------------
+clock0	at pcctwo0 ipl 5
+nvram0	at pcctwo0 offset 0xc0000
+vme0	at pcctwo0 offset 0x40000
+ie0	at pcctwo0 offset 0x46000 ipl 3
+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 offset 0x43000
+memc1	at pcctwo0 offset 0x43100
+# ------------------------------ vme0 devices --------------------------
 vmes0	at vme0
 vmel0	at vme0
-
-#scsibus* at siop?
-#
-#sd*	at scsibus? target ? lun ?
-#st*	at scsibus? target ? lun ?
-#cd*	at scsibus? target ? lun ?
-
-#pseudo-device	sl			# slip
-#pseudo-device	ppp			# ppp
-pseudo-device	pty 16			# pseudo terminals
-pseudo-device	loop			# network loopback
-
-config	netbsd swap on generic
+# ------------------------------ siop0 devices -------------------------
+scsibus* at siop?
+# ------------------------------ scsibus0 devices ----------------------
+#sd0	at scsibus? target 0 lun 0
+#sd1	at scsibus? target 2 lun 0
+sd*	at scsibus? target ? lun ?
+st*	at scsibus? target ? lun ?
+cd*	at scsibus? target ? lun ?
+# ------------------------------ pseudo devices ------------------------
+pseudo-device	rd 2
diff --git a/sys/arch/mvme88k/conf/M187 b/sys/arch/mvme88k/conf/M187
deleted file mode 100644
index 213dcc9357a..00000000000
--- a/sys/arch/mvme88k/conf/M187
+++ /dev/null
@@ -1,129 +0,0 @@
-#
-# This configuration file contains all possible options
-#
-
-machine mvme88k
-
-maxusers 8
-
-options		TIMEZONE=300, DST=1
-
-#
-# processors this kernel should support
-#
-options		"M88000"	# support for 88K
-options		MVME187		# support for 187
-
-options		SWAPPAGER	# Pager for processes (Required)
-options		VNODEPAGER	# Pager for vnodes (Required)
-options		DEVPAGER	# Pager for devices (Required)
-
-options		SYSVSHM
-options		SYSVSEM
-options		SYSVMSG
-
-#options		CD9660		# ISO 9660 + Rock Ridge file system
-#options		MSDOSFS		# MS-DOS file system
-options		FDESC		# /dev/fd
-#options		FIFO		# FIFOs; RECOMMENDED
-options		KERNFS		# /kern
-options		NULLFS		# loopback file system
-#options		PORTAL		# ?
-options		PROCFS		# /proc
-#options		UMAPFS		# NULLFS + uid and gid remapping
-options		UNION		# union file system
-#
-# Networking options
-options		INET
-options		TCP_COMPAT_42	# compatibility with 4.2BSD TCP/IP
-#options	GATEWAY		# IP packet forwarding
-#options	ISO		# OSI networking
-#options	TPIP
-#options	EON
-options		COMPAT_43
-options		EXEC_COFF
-
-options		LKM
-
-#
-
-#
-# 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
-
-#
-# File systems
-#
-options		FFS		# Berkeley fast file system
-options		MFS		# Memory based filesystem
-options		FIFO		# FIFO operations on vnodes (Recommended)
-
-#
-# Compatability options for various existing systems
-#
-#options		"COMPAT_NOMID"	# allow nonvalid machine id executables
-
-#
-# Support for System V IPC facilities.
-#
-
-#
-# Support for various kernel options
-#
-#options		DIAGNOSTIC	# Add additional error checking code
-options		"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		KTRACE		# debug all syscalls.
-
-#
-# devices
-#
-mainbus0 at root
-# mainbus devices
-#sram0	at mainbus0 addr 0xffe00000
-vme0	at mainbus0 addr 0xfff40000
-pcctwo0 at mainbus0 addr 0xfff42000
-# pcctwo devices
-clock0	at pcctwo0 addr 0xfff42000 ipl 5
-nvram0	at pcctwo0 addr 0xfffc0000 size 0x10000
-ie0	at pcctwo0 addr 0xfff46000 ipl 3 size 0x1000
-cl0	at pcctwo0 addr 0xfff45000 ipl 4 size 0x200
-siop0	at pcctwo0 addr 0xfff47000 ipl 2 size 0x1000
-#lptwo0	at pcctwo0 addr 0xfff45000 ipl 1 size
-#mcecc0	at pcctwo0 addr 0xfff43000
-#mcecc1	at pcctwo0 addr 0xfff43100
-#memc0	at pcctwo0 addr 0xfff43000
-#memc1	at pcctwo0 addr 0xfff43100
-
-bugtty0 at mainbus0
-
-#vme0 devices
-vmes0	at vme0
-vmel0	at vme0
-
-scsibus* at siop?
-#
-#sd0	at scsibus? target 0 lun 0
-#sd1	at scsibus? target 2 lun 0
-sd*	at scsibus? target ? lun ?
-st*	at scsibus? target ? lun ?
-cd*	at scsibus? target ? lun ?
-
-pseudo-device	vnd 2
-pseudo-device	bpfilter
-pseudo-device	sl			# slip
-pseudo-device	ppp 2			# ppp
-pseudo-device	pty 16			# pseudo terminals
-pseudo-device	loop			# network loopback
-
-config	netbsd root on sd1 swap on sd1
diff --git a/sys/arch/mvme88k/conf/MYBOX b/sys/arch/mvme88k/conf/MYBOX
deleted file mode 100644
index 1876913aa34..00000000000
--- a/sys/arch/mvme88k/conf/MYBOX
+++ /dev/null
@@ -1,73 +0,0 @@
-#	$Id: MYBOX,v 1.4 1997/03/03 20:20:30 rahnds Exp $
-
-include "std.mvme88k"
-
-maxusers	8
-options		TIMEZONE=300, DST=1
-options		BYTE_MSF
-options		SWAPPAGER, VNODEPAGER, DEVPAGER
-#options		INET
-options		FFS, MFS, FDESC
-#options		"COMPAT_42", "COMPAT_43"
-options		GENERIC, KTRACE, DIAGNOSTIC, "NKMEMCLUSTERS=256"
-#options		PANICWAIT, DEBUG, DDB
-options		PANICWAIT, DEBUG, DDB
-
-#options	"CD9660", PORTAL, MSDOSFS, PROCFS, NULLFS, FIFO, KERNFS
-#options	NFSSERVER, NFSCLIENT
-#options	SYSVSHM, SYSVMSG, SYSVSEM	
-#options	SYSCALL_DEBUG, SCSIDEBUG, KGDB
-
-mainbus0	at root
-
-pcctwo0 at mainbus0 addr 0xfff00000
-clock0	at pcctwo0 ipl 5
-#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 4
-vme0	at pcctwo0 offset 0x40000
-#lptwo0	at pcctwo0 ipl 1
-#mcecc0	at pcctwo0 offset 0x43000
-#mcecc1	at pcctwo0 offset 0x43100
-#memc0	at pcctwo0 offset 0x43000
-#memc1	at pcctwo0 offset 0x43100
-#sram0	at mainbus0 addr 0xffe00000
-
-bugtty0		at mainbus0		# bug tty
-
-# scsi stuff, all possible
-#m187scsi0	at mainbus0
-#bugscsi0	at mainbus0
-#bugscsi0	at pcc0
-
-#scsibus0	at m187scsi0
-#scsibus0	at bugscsi0
-#scsibus0	at scsi0
-#
-# compat.
-#
-#sd0	at scsibus? target 0 lun 0
-#sd1	at scsibus? target 1 lun 0
-#sd2	at scsibus? target 2 lun 0
-#sd3	at scsibus? target 3 lun 0
-#sd4	at scsibus? target 4 lun 0
-#sd5	at scsibus? target 5 lun 0
-#sd6	at scsibus? target 6 lun 0
-
-#
-# This is nicer however many amiga setups expect sd units to refer to
-# scsi target numbers.  If this is not the case, you can remove the 
-# specific sdx lines above and each hard drive from low target to high
-# will configure to the next available sd unit number
-
-#sd*	at scsibus? target ? lun ?	# scsi disks
-#st*	at scsibus? target ? lun ?	# scsi tapes
-#cd*	at scsibus? target ? lun ?	# scsi cd's
-
-#pseudo-device	sl			# slip
-#pseudo-device	ppp			# ppp
-#pseudo-device	pty 16			# pseudo terminals
-#pseudo-device	loop			# network loopback
-#
-config	netbsd swap on generic
diff --git a/sys/arch/mvme88k/conf/Makefile.mvme88k b/sys/arch/mvme88k/conf/Makefile.mvme88k
index e104e579ab9..c59eed7ca8d 100644
--- a/sys/arch/mvme88k/conf/Makefile.mvme88k
+++ b/sys/arch/mvme88k/conf/Makefile.mvme88k
@@ -1,7 +1,7 @@
 #	@(#)Makefile.hp300	7.10 (Berkeley) 6/27/91
-#	$Id: Makefile.mvme88k,v 1.4 1998/09/15 04:01:22 smurph Exp $
+#	$Id: Makefile.mvme88k,v 1.5 1998/12/15 06:02:55 smurph Exp $
 #
-# Makefile for NetBSD
+# Makefile for OpenBSD
 #
 # This makefile is constructed from a machine description:
 #	config machineid
@@ -22,14 +22,15 @@
 
 # DEBUG is set to -g by config if debugging is requested (config -g).
 # PROF is set to -pg by config if profiling is requested (config -p).
-DESTDIR=/usr/cross/mvme88k
-DESTBIN=${DESTDIR}/usr/m88k-unknown-openbsd2.2/bin
-AS=     ${DESTBIN}/as ${DEBUG}
-AWK=	awk
-CC=     ${DESTBIN}/gcc ${DEBUG}
-CPP=    cpp
-LD=     ${DESTBIN}/ld
-TOUCH=	touch -f -c
+
+AS?= 	as ${DEBUG}
+AWK?=	awk
+CC?=    cc ${DEBUG}
+CPP?=   cpp
+LD?=    ld
+TOUCH?=	touch -f -c
+SIZE?=	size
+STRIP?= strip
 
 .ifndef HOSTCC
 HOSTCC=cc
@@ -99,14 +100,14 @@ SYSTEM_LD=	-@if [ X${DEBUG} = X-g ]; \
 		then strip=-X; \
 		else strip=-x; \
 		fi; \
-		echo ${LD} $$strip -Ttext 0x10000 -o $@ ${SYSTEM_OBJ} libgcc.a vers.o; \
-		${LD} $$strip -Ttext 0x10000 -e start -o $@ ${SYSTEM_OBJ} \
-			libgcc.a vers.o
+		echo ${LD} $$strip -Ttext 0x10000 -o $@ ${SYSTEM_OBJ} vers.o; \
+		${LD} $$strip -Ttext 0x10000 -e start ${LINKFLAGS} -o $@ \
+			${SYSTEM_OBJ} vers.o -lgcc -lgcc
 
-SYSTEM_LD_TAIL=	@size $@; chmod 755 $@; \
+SYSTEM_LD_TAIL=	@${SIZE} $@; chmod 755 $@; \
 		[ X${DEBUG} = X-g ] && { \
 		echo cp $@ $@.gdb; rm -f $@.gdb; cp $@ $@.gdb; \
-		echo strip -d $@; strip -d $@; } || true
+		echo ${STRIP} -d $@; ${STRIP} -d $@; } || true
 
 %LOAD
 
@@ -117,6 +118,11 @@ genassym:
 	${HOSTCC} -static ${INCLUDES} ${IDENT} ${PARAM} -Dmvme88k -Dm88k \
 	    -o genassym ${MVME88K}/mvme88k/genassym.c
 
+assym.h: $S/kern/genassym.sh ${MVME68K}/mvme68k/genassym.cf
+	sh $S/kern/genassym.sh ${HOSTCC} ${CFLAGS} ${CPPFLAGS} \
+	    ${PARAM} < ${MVME88K}/mvme88k/genassym.cf > assym.h.tmp && \
+	    mv -f assym.h.tmp assym.h
+
 vers.o:	newvers
 
 newvers: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP}
@@ -152,7 +158,7 @@ genassym.o machdep.o: Makefile
 locore.o machdep.o: Makefile
 
 depend:: .depend
-.depend: assym.s param.c vnode_if.h
+.depend: assym.s param.c 
 	mkdep ${CFLAGS} ${CPPFLAGS} ${CFILES} ioconf.c param.c
 	mkdep -a -p ${INCLUDES} ${IDENT} ${PARAM} ${MVME88K}/mvme88k/genassym.c
 
diff --git a/sys/arch/mvme88k/conf/NFS b/sys/arch/mvme88k/conf/NFS
deleted file mode 100644
index c39c9162e98..00000000000
--- a/sys/arch/mvme88k/conf/NFS
+++ /dev/null
@@ -1,130 +0,0 @@
-#
-# This configuration file contains all possible options
-#
-
-machine mvme88k
-
-maxusers 32
-
-options		TIMEZONE=300, DST=1
-
-options		__OpenBSD__
-#
-# processors this kernel should support
-#
-options		"M88000"	# support for 88K
-options		MVME187		# support for 187
-
-options		SWAPPAGER	# Pager for processes (Required)
-options		VNODEPAGER	# Pager for vnodes (Required)
-options		DEVPAGER	# Pager for devices (Required)
-
-options		SYSVSHM
-options		SYSVSEM
-options		SYSVMSG
-
-#options		CD9660		# ISO 9660 + Rock Ridge file system
-#options		MSDOSFS		# MS-DOS file system
-options		FDESC		# /dev/fd
-#options		FIFO		# FIFOs; RECOMMENDED
-options		KERNFS		# /kern
-options		NULLFS		# loopback file system
-#options		PORTAL		# ?
-options		PROCFS		# /proc
-#options		UMAPFS		# NULLFS + uid and gid remapping
-options		UNION		# union file system
-#
-# Networking options
-options		INET
-options		TCP_COMPAT_42	# compatibility with 4.2BSD TCP/IP
-#options	GATEWAY		# IP packet forwarding
-#options	ISO		# OSI networking
-#options	TPIP
-#options	EON
-options		COMPAT_43
-options		EXEC_COFF
-
-options		LKM
-
-#
-
-#
-# 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
-
-#
-# File systems
-#
-options		FFS		# Berkeley fast file system
-options		MFS		# Memory based filesystem
-options		FIFO		# FIFO operations on vnodes (Recommended)
-
-#
-# Compatability options for various existing systems
-#
-#options		"COMPAT_NOMID"	# allow nonvalid machine id executables
-
-#
-# Support for System V IPC facilities.
-#
-
-#
-# Support for various kernel options
-#
-#options		DIAGNOSTIC	# Add additional error checking code
-options		"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		KTRACE		# debug all syscalls.
-
-#
-# devices
-#
-mainbus0 at root
-# mainbus devices
-#sram0	at mainbus0 addr 0xffe00000
-vme0	at mainbus0 addr 0xfff40000
-pcctwo0 at mainbus0 addr 0xfff42000
-# pcctwo devices
-clock0	at pcctwo0 addr 0xfff42000 ipl 5
-nvram0	at pcctwo0 addr 0xfffc0000 size 0x10000
-ie0	at pcctwo0 addr 0xfff46000 ipl 3 size 0x1000
-cl0	at pcctwo0 addr 0xfff45000 ipl 4 size 0x200
-siop0	at pcctwo0 addr 0xfff47000 ipl 2 size 0x1000
-#lptwo0	at pcctwo0 addr 0xfff45000 ipl 1 size
-#mcecc0	at pcctwo0 addr 0xfff43000
-#mcecc1	at pcctwo0 addr 0xfff43100
-#memc0	at pcctwo0 addr 0xfff43000
-#memc1	at pcctwo0 addr 0xfff43100
-
-bugtty0 at mainbus0
-
-#vme0 devices
-vmes0	at vme0
-vmel0	at vme0
-
-scsibus* at siop?
-#
-#sd0	at scsibus? target 0 lun 0
-#sd1	at scsibus? target 2 lun 0
-sd*	at scsibus? target ? lun ?
-st*	at scsibus? target ? lun ?
-cd*	at scsibus? target ? lun ?
-
-pseudo-device	vnd 2
-pseudo-device	bpfilter
-pseudo-device	sl			# slip
-pseudo-device	ppp 2			# ppp
-pseudo-device	pty 16			# pseudo terminals
-pseudo-device	loop			# network loopback
-
-config	bsd root on sd0 swap on sd0
diff --git a/sys/arch/mvme88k/conf/OFF b/sys/arch/mvme88k/conf/OFF
new file mode 100644
index 00000000000..bc59ae932fd
--- /dev/null
+++ b/sys/arch/mvme88k/conf/OFF
@@ -0,0 +1,117 @@
+#
+# This configuration file contains all possible options
+#
+
+machine mvme88k
+
+maxusers 64
+
+options		TIMEZONE=300, DST=1
+
+# processors this kernel should support
+
+options		"M88000"	# support for 88K
+options		MVME187		# support for 187
+
+options		SWAPPAGER	# Pager for processes (Required)
+options		VNODEPAGER	# Pager for vnodes (Required)
+options		DEVPAGER	# Pager for devices (Required)
+
+options		SYSVSHM
+options		SYSVSEM
+options		SYSVMSG
+
+# 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
+
+# File systems
+
+options		FFS		# Berkeley fast file system
+options		MFS		# Memory based filesystem
+options		FIFO		# FIFO operations on vnodes (Recommended)
+options		CD9660		# ISO 9660 + Rock Ridge file system
+#options		MSDOSFS		# MS-DOS file system
+options		FDESC		# /dev/fd
+options		KERNFS		# /kern
+options		NULLFS		# loopback file system
+#options		PORTAL		# ?
+options		PROCFS		# /proc
+#options		UMAPFS		# NULLFS + uid and gid remapping
+#options		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
+options		INET
+options		GATEWAY		# IP packet forwarding
+#options		TCP_COMPAT_42	# compatibility with 4.2BSD TCP/IP
+#options		ISO		# OSI networking
+#options		TPIP
+#options		EON
+#options		COMPAT_43
+#options		EXEC_COFF
+#options		LKM
+
+# Support for various kernel options
+
+#options		DIAGNOSTIC	# Add additional error checking code
+#options		"NKMEMCLUSTERS=512"	# 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		KTRACE		# debug all syscalls.
+
+# devices
+
+mainbus0 at root
+# ------------------------------ mainbus devices ------------------------
+#bugtty0 at mainbus0
+#sram0	at mainbus0 addr 0xffe00000
+#vme0	at mainbus0 addr 0xfff40000
+pcctwo0 at mainbus0 addr 0xfff00000
+# ------------------------------ pcctwo devices -------------------------
+clock0	at pcctwo0 ipl 5
+nvram0	at pcctwo0 offset 0xc0000
+ie0	at pcctwo0 offset 0x46000 ipl 3
+siop0	at pcctwo0 offset 0x47000 ipl 2
+cl0	at pcctwo0 offset 0x45000 ipl 3
+#vme0	at pcctwo0 offset 0x40000
+#lptwo0	at pcctwo0 addr 0xfff45000 ipl 1 size
+#mcecc0	at pcctwo0 addr 0xfff43000
+#mcecc1	at pcctwo0 addr 0xfff43100
+#memc0	at pcctwo0 addr 0xfff43000
+#memc1	at pcctwo0 addr 0xfff43100
+# ------------------------------ vme0 devices --------------------------
+#vmes0	at vme0
+#vmel0	at vme0
+# ------------------------------ siop0 devices -------------------------
+scsibus* at siop?
+# ------------------------------ scsibus0 devices ----------------------
+#sd0	at scsibus? target 0 lun 0
+#sd1	at scsibus? target 2 lun 0
+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
diff --git a/sys/arch/mvme88k/conf/RAMDISK b/sys/arch/mvme88k/conf/RAMDISK
new file mode 100644
index 00000000000..f51ea7ed1b0
--- /dev/null
+++ b/sys/arch/mvme88k/conf/RAMDISK
@@ -0,0 +1,48 @@
+#	$OpenBSD: RAMDISK,v 1.1 1998/12/15 06:02:55 smurph Exp $
+
+machine		mvme88k 
+
+include "../../../conf/GENERIC"
+
+options		"M88000"	# support for 88K
+options		MVME187		# support for 187
+
+maxusers	32
+
+config		bsd		root rd0 swap rd0
+
+#
+# devices
+#
+mainbus0 at root
+# ------------------------------ mainbus devices ------------------------
+#bugtty0 at mainbus0
+sram0	at mainbus0 addr 0xffe00000
+pcctwo0 at mainbus0 addr 0xfff00000
+# ------------------------------ pcctwo devices -------------------------
+clock0	at pcctwo0 ipl 5
+nvram0	at pcctwo0 offset 0xc0000
+ie0	at pcctwo0 offset 0x46000 ipl 3
+siop0	at pcctwo0 offset 0x47000 ipl 2
+cl0	at pcctwo0 offset 0x45000 ipl 3
+vme0	at pcctwo0 offset 0x40000
+#lptwo0	at pcctwo0 offset 0x45000 ipl 1 
+# ------------------------------ vme0 devices --------------------------
+vmes0	at vme0
+vmel0	at vme0
+# ------------------------------ siop0 devices -------------------------
+scsibus* at siop?
+# ------------------------------ scsibus0 devices ----------------------
+#sd0	at scsibus? target 0 lun 0
+#sd1	at scsibus? target 2 lun 0
+sd*	at scsibus? target ? lun ?
+st*	at scsibus? target ? lun ?
+cd*	at scsibus? target ? lun ?
+# ------------------------------ pseudo devices ------------------------
+#pseudo-device	vnd 2
+#pseudo-device	bpfilter
+#pseudo-device	sl			# slip
+
+option MINIROOTSIZE=8192
+option RAMDISK_HOOKS
+pseudo-device	rd 2
diff --git a/sys/arch/mvme88k/conf/files.mvme88k b/sys/arch/mvme88k/conf/files.mvme88k
index d619ec87595..de53cfe1f1a 100644
--- a/sys/arch/mvme88k/conf/files.mvme88k
+++ b/sys/arch/mvme88k/conf/files.mvme88k
@@ -10,27 +10,39 @@ attach bugtty at mainbus
 file	arch/mvme88k/dev/bugtty.c			bugtty needs-count
 device cpu
 attach cpu at mainbus
-device vme { [addr = -1], [size = -1], [ipl = 0], [vec = -1] }
-attach vme at mainbus
-device pcctwo { [addr = -1], [size = 4096], [ipl = 0] }
+
+#device pcctwo { [addr = -1], [size = 4096], [ipl = 0] }
+device pcctwo { [offset = -1], [ ipl = 0 ] }
+
 attach pcctwo at mainbus
 file	arch/mvme88k/dev/pcctwo.c			pcctwo needs-count
+
 device clock
 attach clock at pcctwo
 file	arch/mvme88k/dev/clock.c			clock
+
+device memc
+attach memc at pcctwo
+file	arch/mvme88k/dev/memc.c			memc
+
+device sram
+attach sram at mainbus
 device nvram
 attach nvram at pcctwo
-file	arch/mvme88k/dev/nvram.c			nvram
+file	arch/mvme88k/dev/sram.c				sram needs-count
+file	arch/mvme88k/dev/nvram.c			nvram needs-count
+file	arch/mvme88k/dev/memdevs.c			nvram | sram
+
 device cl: tty
 attach cl at pcctwo
 file	arch/mvme88k/dev/cl.c				cl needs-count
-#device ether at pcctwo
 
 include "../../../scsi/files.scsi"
 
 major { sd = 4 }
 major { st = 5 }
 major { cd = 6 }
+major { rd = 7 }
 major { vnd = 8 }
 
 device siop: scsi
@@ -38,18 +50,20 @@ attach siop at pcctwo
 file	arch/mvme88k/dev/siop.c				siop
 file	arch/mvme88k/dev/siopdma.c			siop
 
-device vmes
+device vme { }
+attach vme at pcctwo
+device vmes { [addr = -1], [len = -1], [vec = -1], [ipl = 0] }
 attach vmes at vme
-device vmel
+device vmel { [addr = -1], [len = -1], [vec = -1], [ipl = 0] }
 attach vmel at vme
+file	arch/mvme88k/dev/vme.c			vme | vmes | vmel
+file	arch/mvme88k/dev/vmes.c			vmes needs-count
+file	arch/mvme88k/dev/vmel.c			vmel needs-count
 
-#device vme at mainbus { }
-#device vmes at vme { [addr = -1], [len = -1], [vec = -1], [ipl = 0] }
-#device vmel at vme { [addr = -1], [len = -1], [vec = -1], [ipl = 0] }
-
-file	arch/mvme88k/dev/vme.c				vme | vmes | vmel
-file	arch/mvme88k/dev/vmes.c				vmes needs-count
-file	arch/mvme88k/dev/vmel.c				vmel needs-count
+#ramdisk support
+pseudo-device rd
+file 	dev/ramdisk.c					rd needs-flag
+file 	arch/mvme88k/dev/rd_root.c			ramdisk_hooks
 
 # list of standard files
 file	dev/cons.c					ite | ser | tty
@@ -77,16 +91,13 @@ file	arch/mvme88k/mvme88k/process.S
 file	arch/mvme88k/mvme88k/process_machdep.c
 file	arch/mvme88k/mvme88k/trap.c
 file	arch/mvme88k/mvme88k/vm_machdep.c
-
 file	arch/mvme88k/ddb/db_disasm.c
 file	arch/mvme88k/ddb/db_interface.c
 file	arch/mvme88k/ddb/db_sstep.c
 file	arch/mvme88k/ddb/db_trace.c
-
 file	arch/mvme88k/dev/mainbus.c
 file	arch/mvme88k/dev/bugio.c
 
-
 device ie: ifnet, ether
 attach ie at pcctwo: ifnet, ether
 file    arch/mvme88k/dev/if_ie.c			ie