summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/arch/mvme88k/conf/GENERIC47
-rw-r--r--sys/arch/mvme88k/conf/M187136
-rw-r--r--sys/arch/mvme88k/conf/M188126
-rw-r--r--sys/arch/mvme88k/conf/M197137
-rw-r--r--sys/arch/mvme88k/conf/Makefile.mvme88k7
-rw-r--r--sys/arch/mvme88k/conf/OFF115
-rw-r--r--sys/arch/mvme88k/conf/RAMDISK61
-rw-r--r--sys/arch/mvme88k/conf/XT23
-rw-r--r--sys/arch/mvme88k/conf/files.mvme88k41
-rw-r--r--sys/arch/mvme88k/conf/std.mvme88k7
10 files changed, 543 insertions, 157 deletions
diff --git a/sys/arch/mvme88k/conf/GENERIC b/sys/arch/mvme88k/conf/GENERIC
index bccdcd6a65f..70c9de51ee5 100644
--- a/sys/arch/mvme88k/conf/GENERIC
+++ b/sys/arch/mvme88k/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.8 1999/05/29 04:41:42 smurph Exp $
+# $OpenBSD: GENERIC,v 1.9 1999/09/27 21:21:15 smurph Exp $
machine mvme88k
@@ -6,6 +6,8 @@ include "../../../conf/GENERIC"
options "M88000" # support for 88K
options MVME187 # support for 187
+options MVME188 # support for 188
+options MVME197 # support for 197
maxusers 64
@@ -14,13 +16,21 @@ config bsd swap generic
#
# devices
#
+
mainbus0 at root
+
# ------------------------------ mainbus devices ------------------------
-#bugtty0 at mainbus0
-#sram0 at mainbus0 addr 0xffe00000
+bugtty0 at mainbus0
pcctwo0 at mainbus0 addr 0xfff00000
+syscon0 at mainbus0 addr 0xfff00000
+busswitch0 at mainbus0 addr 0xfff00000
+
+# ----------------------------- busswicth devices -----------------------
+pcctwo0 at busswitch0 offset 0x42000
+
# ------------------------------ pcctwo devices -------------------------
clock0 at pcctwo0 ipl 5
+sclock0 at pcctwo0 ipl 5
nvram0 at pcctwo0 offset 0xc0000
vme0 at pcctwo0 offset 0x40000
ie0 at pcctwo0 offset 0x46000 ipl 3
@@ -29,16 +39,43 @@ 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
+
+# ------------------------------ 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?
+
# ------------------------------ 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
new file mode 100644
index 00000000000..720d7313ba8
--- /dev/null
+++ b/sys/arch/mvme88k/conf/M187
@@ -0,0 +1,136 @@
+# $OpenBSD: M187,v 1.4 1999/09/27 21:21:15 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 "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
+pcctwo0 at mainbus0 addr 0xfff00000
+
+# ------------------------------ 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
+
+# ------------------------------ 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 1 vec 0x74 len 0x100
+ve1 at vmes0 addr 0xffff1400 ipl 1 vec 0x75 len 0x100
+ve2 at vmes0 addr 0xffff1600 ipl 1 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?
+
+# ------------------------------ scsibus0 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
diff --git a/sys/arch/mvme88k/conf/M188 b/sys/arch/mvme88k/conf/M188
new file mode 100644
index 00000000000..82be976d255
--- /dev/null
+++ b/sys/arch/mvme88k/conf/M188
@@ -0,0 +1,126 @@
+# $OpenBSD: M188,v 1.1 1999/09/27 21:21:15 smurph Exp $
+
+machine mvme88k
+
+maxusers 64
+
+option TIMEZONE=300, DST=1
+
+# processors this kernel should support
+
+option "M88000" # support for 88K
+option MVME188 # support for 188
+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
+syscon0 at mainbus0 addr 0xfff00000
+
+# ------------------------------ 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 1 vec 0x74 len 0x100
+ve1 at vmes0 addr 0xffff1400 ipl 1 vec 0x75 len 0x100
+ve2 at vmes0 addr 0xffff1600 ipl 1 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?
+
+# ------------------------------ 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
diff --git a/sys/arch/mvme88k/conf/M197 b/sys/arch/mvme88k/conf/M197
new file mode 100644
index 00000000000..9db01a62996
--- /dev/null
+++ b/sys/arch/mvme88k/conf/M197
@@ -0,0 +1,137 @@
+# $OpenBSD: M197,v 1.1 1999/09/27 21:21:15 smurph Exp $
+
+machine mvme88k
+
+maxusers 64
+
+option TIMEZONE=300, DST=1
+
+# processors this kernel should support
+
+option "M88000" # support for 88K
+option MVME197 # support for 197
+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
+
+# ----------------------------- 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
+
+# ------------------------------ 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 1 vec 0x74 len 0x100
+ve1 at vmes0 addr 0xffff1400 ipl 1 vec 0x75 len 0x100
+ve2 at vmes0 addr 0xffff1600 ipl 1 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
diff --git a/sys/arch/mvme88k/conf/Makefile.mvme88k b/sys/arch/mvme88k/conf/Makefile.mvme88k
index c59eed7ca8d..e275ae19e27 100644
--- a/sys/arch/mvme88k/conf/Makefile.mvme88k
+++ b/sys/arch/mvme88k/conf/Makefile.mvme88k
@@ -1,5 +1,5 @@
# @(#)Makefile.hp300 7.10 (Berkeley) 6/27/91
-# $Id: Makefile.mvme88k,v 1.5 1998/12/15 06:02:55 smurph Exp $
+# $Id: Makefile.mvme88k,v 1.6 1999/09/27 21:21:15 smurph Exp $
#
# Makefile for OpenBSD
#
@@ -100,7 +100,8 @@ SYSTEM_LD= -@if [ X${DEBUG} = X-g ]; \
then strip=-X; \
else strip=-x; \
fi; \
- echo ${LD} $$strip -Ttext 0x10000 -o $@ ${SYSTEM_OBJ} 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
@@ -130,7 +131,7 @@ newvers: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP}
${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c vers.c
clean::
- rm -f eddep *bsd bsd.gdb tags *.o locore.i \
+ rm -f eddep *bsd bsd.gdb tags *.o locore.i .depend \
[a-z]*.s [Ee]rrs errs linterrs makelinks
lint: /tmp param.c
diff --git a/sys/arch/mvme88k/conf/OFF b/sys/arch/mvme88k/conf/OFF
deleted file mode 100644
index eeb43a24148..00000000000
--- a/sys/arch/mvme88k/conf/OFF
+++ /dev/null
@@ -1,115 +0,0 @@
-# $OpenBSD: OFF,v 1.2 1999/02/09 06:36:24 smurph Exp $
-
-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
index 21f811f6bf8..022004849cc 100644
--- a/sys/arch/mvme88k/conf/RAMDISK
+++ b/sys/arch/mvme88k/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.2 1999/05/29 04:41:42 smurph Exp $
+# $OpenBSD: RAMDISK,v 1.3 1999/09/27 21:21:15 smurph Exp $
machine mvme88k
@@ -6,43 +6,72 @@ include "../../../conf/GENERIC"
options "M88000" # support for 88K
options MVME187 # support for 187
+options MVME188 # support for 188
+options MVME197 # support for 197
-maxusers 32
+maxusers 8
config bsd root rd0 swap rd0
-#
-# devices
-#
+# ------------------------------ devices --------------------------------
mainbus0 at root
+
# ------------------------------ mainbus devices ------------------------
-#bugtty0 at mainbus0
-#sram0 at mainbus0 addr 0xffe00000
+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 3
+ie0 at pcctwo0 offset 0x46000 ipl 1
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
+
+# ------------------------------ 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 1 vec 0x74 len 0x100
+ve1 at vmes0 addr 0xffff1400 ipl 1 vec 0x75 len 0x100
+ve2 at vmes0 addr 0xffff1600 ipl 1 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?
+
# ------------------------------ 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
+# ------------------------------ pseudo devices ------------------------
option MINIROOTSIZE=8192
option RAMDISK_HOOKS
pseudo-device rd 2
diff --git a/sys/arch/mvme88k/conf/XT b/sys/arch/mvme88k/conf/XT
index ccdac5baefc..352ace495d8 100644
--- a/sys/arch/mvme88k/conf/XT
+++ b/sys/arch/mvme88k/conf/XT
@@ -1,4 +1,4 @@
-# $OpenBSD: XT,v 1.1 1999/05/29 04:48:31 smurph Exp $
+# $OpenBSD: XT,v 1.2 1999/09/27 21:21:16 smurph Exp $
machine mvme88k
@@ -11,6 +11,9 @@ option TIMEZONE=300, DST=1
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)
@@ -68,17 +71,22 @@ 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.
+#option KTRACE # debug all syscalls.
# ------------------------------ devices --------------------------------
mainbus0 at root
# ------------------------------ mainbus devices ------------------------
-#bugtty0 at mainbus0
+bugtty0 at mainbus0
#sram0 at mainbus0 addr 0xffe00000
#vme0 at mainbus0 addr 0xfff40000
pcctwo0 at mainbus0 addr 0xfff00000
+syscon0 at mainbus0 addr 0xfff00000
+busswitch0 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 3
@@ -87,6 +95,12 @@ 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
@@ -107,12 +121,9 @@ vs5 at vmes0 addr 0xffff7800 ipl 2 vec 0x8a len 0x800
# ------------------------------ svme0 devices -------------------------
scsibus* at vs?
-# ------------------------------ scsibus0 devices ----------------------
# ------------------------------ 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 ?
diff --git a/sys/arch/mvme88k/conf/files.mvme88k b/sys/arch/mvme88k/conf/files.mvme88k
index 809e2ab4e3e..000d8c11416 100644
--- a/sys/arch/mvme88k/conf/files.mvme88k
+++ b/sys/arch/mvme88k/conf/files.mvme88k
@@ -1,4 +1,4 @@
-# $OpenBSD: files.mvme88k,v 1.5 1999/08/17 22:47:15 mickey Exp $
+# $OpenBSD: files.mvme88k,v 1.6 1999/09/27 21:21:16 smurph Exp $
#
maxpartitions 16
@@ -10,27 +10,39 @@ attach mainbus at root
device bugtty: tty
attach bugtty at mainbus
file arch/mvme88k/dev/bugtty.c bugtty needs-count
+
device cpu
attach cpu at mainbus
-#device pcctwo { [addr = -1], [size = 4096], [ipl = 0] }
-device pcctwo { [offset = -1], [ ipl = 0 ] }
+device busswitch { [offset = -1], [ ipl = 0 ] }
+attach busswitch at mainbus
+file arch/mvme88k/dev/busswitch.c busswitch needs-count
-attach pcctwo at mainbus
+device pcctwo { [offset = -1], [ ipl = 0 ] }
+attach pcctwo at busswitch, mainbus
file arch/mvme88k/dev/pcctwo.c pcctwo needs-count
+device syscon { [offset = -1], [ ipl = 0 ] }
+attach syscon at mainbus
+file arch/mvme88k/dev/syscon.c syscon needs-count
+
device clock
-attach clock at pcctwo
+attach clock at pcctwo, syscon
file arch/mvme88k/dev/clock.c clock
+device sclock
+attach sclock at pcctwo, syscon
+file arch/mvme88k/dev/sclock.c sclock
+
device memc
attach memc at pcctwo
-file arch/mvme88k/dev/memc.c memc
+file arch/mvme88k/dev/memc.c memc
device sram
attach sram at mainbus
+
device nvram
-attach nvram at pcctwo
+attach nvram at pcctwo, syscon
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
@@ -39,6 +51,10 @@ device cl: tty
attach cl at pcctwo
file arch/mvme88k/dev/cl.c cl needs-count
+device dart: tty
+attach dart at syscon
+file arch/mvme88k/dev/dart.c dart needs-count
+
include "../../../scsi/files.scsi"
major { sd = 4 }
@@ -53,7 +69,7 @@ file arch/mvme88k/dev/siop.c siop
file arch/mvme88k/dev/siopdma.c siop
device vme { }
-attach vme at pcctwo
+attach vme at pcctwo, syscon
device vmes { [addr = -1], [len = -1], [vec = -1], [ipl = 0] }
attach vmes at vme
device vmel { [addr = -1], [len = -1], [vec = -1], [ipl = 0] }
@@ -80,15 +96,20 @@ file netns/ns_cksum.c ns
file arch/mvme88k/mvme88k/autoconf.c
file arch/mvme88k/mvme88k/conf.c
file arch/mvme88k/mvme88k/cmmu.c
+file arch/mvme88k/mvme88k/m18x_cmmu.c
+file arch/mvme88k/mvme88k/m197_cmmu.c
file arch/mvme88k/mvme88k/disksubr.c
file arch/mvme88k/mvme88k/dkbad.c
file arch/mvme88k/mvme88k/eh.S
file arch/mvme88k/mvme88k/locore_asm_routines.S
file arch/mvme88k/mvme88k/locore_c_routines.c
file arch/mvme88k/mvme88k/m88100_fp.S
+file arch/mvme88k/mvme88k/m88110_fp.S
+file arch/mvme88k/mvme88k/m88110_mmu.S
file arch/mvme88k/mvme88k/machdep.c
file arch/mvme88k/mvme88k/mem.c
file arch/mvme88k/mvme88k/pmap.c
+file arch/mvme88k/mvme88k/pmap_table.c
file arch/mvme88k/mvme88k/process.S
file arch/mvme88k/mvme88k/process_machdep.c
file arch/mvme88k/mvme88k/trap.c
@@ -107,6 +128,10 @@ device ve: ether, ifnet, ifmedia
attach ve at vmes
file arch/mvme88k/dev/if_ve.c ve
+#device vp: ether, ifnet, ifmedia
+#attach vp at vmes
+#file arch/mvme88k/dev/if_vp.c vp
+
device vx: tty
attach vx at vmes
file arch/mvme88k/dev/vx.c vx needs-count
diff --git a/sys/arch/mvme88k/conf/std.mvme88k b/sys/arch/mvme88k/conf/std.mvme88k
index 54dbef6c782..846f46d79d2 100644
--- a/sys/arch/mvme88k/conf/std.mvme88k
+++ b/sys/arch/mvme88k/conf/std.mvme88k
@@ -1,7 +1,6 @@
-# standard amiga information
-# $OpenBSD: std.mvme88k,v 1.2 1999/02/09 06:36:24 smurph Exp $
+# standard mvme88k information
+# $OpenBSD: std.mvme88k,v 1.3 1999/09/27 21:21:16 smurph Exp $
machine mvme88k
mainbus0 at root
-#pcc0 at mainbus0
-#scsi0 at pcc0
+