summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2009-02-14 17:42:01 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2009-02-14 17:42:01 +0000
commit6ce42ccf7a60458d5699bc112588880972997b02 (patch)
tree08619419c1702f66fcb0082e39b3dc003895a3e7 /sys
parent7f4a328769d19185d1b10dea05e35d4adabc7bac (diff)
Sync device lists with GENERIC.
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/mvme88k/conf/M18765
-rw-r--r--sys/arch/mvme88k/conf/M18861
-rw-r--r--sys/arch/mvme88k/conf/M19772
3 files changed, 121 insertions, 77 deletions
diff --git a/sys/arch/mvme88k/conf/M187 b/sys/arch/mvme88k/conf/M187
index 25e19ff7ced..87197155109 100644
--- a/sys/arch/mvme88k/conf/M187
+++ b/sys/arch/mvme88k/conf/M187
@@ -1,31 +1,40 @@
-# $OpenBSD: M187,v 1.35 2006/05/28 11:09:56 miod Exp $
+# $OpenBSD: M187,v 1.36 2009/02/14 17:42:00 miod Exp $
+#
+# For further information on compiling OpenBSD kernels, see the config(8)
+# man page.
+#
+# For further information on hardware support for this architecture, see
+# the intro(4) man page. For further information about kernel options
+# for this architecture, see the options(4) man page. For an explanation
+# of each device driver in this file see the section 4 man page for the
+# device.
-machine mvme88k m88k
-
-include "../../../conf/GENERIC"
+machine mvme88k m88k
+include "../../../conf/GENERIC"
+maxusers 32 # estimated number of users
# Processor type
option M88100
-option MVME187 # support for 187 (requires M88100)
+option MVME187 # support for 187 (requires M88100)
# Define this if your processor has the xxx.usr bug (mask C82N)
option ERRATA__XXX_USR
-maxusers 64
-config bsd swap on generic
+config bsd swap generic
+
+#
+# devices
+#
-# ------------------------------ devices --------------------------------
mainbus0 at root
-# ------------------------------ mainbus devices ------------------------
+# MVME1x7 devices
pcctwo0 at mainbus0 addr 0xfff00000
sram0 at mainbus0 addr 0xffe00000
-
-# ------------------------------ pcctwo devices -------------------------
-vme0 at pcctwo0 offset 0x40000
nvram0 at pcctwo0 offset 0xc0000
+vme0 at pcctwo0 offset 0x40000
ie0 at pcctwo0 offset 0x46000 ipl 3
osiop0 at pcctwo0 offset 0x47000 ipl 2
cl0 at pcctwo0 offset 0x45000 ipl 3
@@ -34,32 +43,38 @@ cl1 at pcctwo0 offset 0x45200 ipl 3 # M8120 only
memc0 at pcctwo0 offset 0x43000
memc1 at pcctwo0 offset 0x43100
-# ------------------------------ vme0 devices --------------------------
vmes0 at vme0
vmel0 at vme0
-# ------------------------------ vmes0 devices -------------------------
+# MVME327
+vsbic0 at vmes0 addr 0xffffa600 ipl 2
+vsbic1 at vmes0 addr 0xffffa700 ipl 2
+# MVME328, MVME328XT
+vs0 at vmes0 addr 0xffff9000 ipl 2
+vs1 at vmes0 addr 0xffff9800 ipl 2
+vs2 at vmes0 addr 0xffff4800 ipl 2
+vs3 at vmes0 addr 0xffff5800 ipl 2
+vs4 at vmes0 addr 0xffff7000 ipl 2
+vs5 at vmes0 addr 0xffff7800 ipl 2
+# MVME332XT
vx0 at vmes0 addr 0xff780000 ipl 3
vx1 at vmes0 addr 0xff790000 ipl 3
vx2 at vmes0 addr 0xff7a0000 ipl 3
vx3 at vmes0 addr 0xff7b0000 ipl 3
+# MVME376
le0 at vmes0 addr 0xffff1200 ipl 3
le1 at vmes0 addr 0xffff1400 ipl 3
le2 at vmes0 addr 0xffff1600 ipl 3
-vs0 at vmes0 addr 0xffff9000 ipl 2
-vs1 at vmes0 addr 0xffff9800 ipl 2
-vs2 at vmes0 addr 0xffff4800 ipl 2
-vs3 at vmes0 addr 0xffff5800 ipl 2
-vs4 at vmes0 addr 0xffff7000 ipl 2
-vs5 at vmes0 addr 0xffff7800 ipl 2
-# ------------------------------- vs0 devices --------------------------
-scsibus* at vs?
-
-# ----------------------------- osiop0 devices -------------------------
scsibus* at osiop?
+scsibus* at vs?
+scsibus* at vsbic?
-# ------------------------------ scsibus0 devices ----------------------
sd* at scsibus?
st* at scsibus?
cd* at scsibus?
+ch* at scsibus?
+ss* at scsibus?
+safte* at scsibus?
+ses* at scsibus?
+uk* at scsibus?
diff --git a/sys/arch/mvme88k/conf/M188 b/sys/arch/mvme88k/conf/M188
index bde0608d889..4b52238e5b1 100644
--- a/sys/arch/mvme88k/conf/M188
+++ b/sys/arch/mvme88k/conf/M188
@@ -1,56 +1,73 @@
-# $OpenBSD: M188,v 1.28 2006/05/28 11:09:56 miod Exp $
+# $OpenBSD: M188,v 1.29 2009/02/14 17:42:00 miod Exp $
+#
+# For further information on compiling OpenBSD kernels, see the config(8)
+# man page.
+#
+# For further information on hardware support for this architecture, see
+# the intro(4) man page. For further information about kernel options
+# for this architecture, see the options(4) man page. For an explanation
+# of each device driver in this file see the section 4 man page for the
+# device.
-machine mvme88k m88k
-
-include "../../../conf/GENERIC"
+machine mvme88k m88k
+include "../../../conf/GENERIC"
+maxusers 32 # estimated number of users
# Processor type
option M88100
-option M88110
-option MVME188 # support for 188 (requires M88100)
+option MVME188 # support for 188 (requires M88100)
# Define this if your processor has the xxx.usr bug (mask C82N)
option ERRATA__XXX_USR
-maxusers 64
+option MULTIPROCESSOR # comment out if 1P64 model...
+
+config bsd swap generic
-config bsd swap on generic
+#
+# devices
+#
-# ------------------------------ devices --------------------------------
mainbus0 at root
-# ------------------------------ mainbus devices ------------------------
+# MVME188 devices
syscon0 at mainbus0 addr 0xfff00000
-
-# ------------------------------ syscon0 devices ------------------------
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 -------------------------
+# MVME327
+vsbic0 at vmes0 addr 0xffffa600 ipl 2
+vsbic1 at vmes0 addr 0xffffa700 ipl 2
+# MVME328, MVME328XT
+vs0 at vmes0 addr 0xffff9000 ipl 2
+vs1 at vmes0 addr 0xffff9800 ipl 2
+vs2 at vmes0 addr 0xffff4800 ipl 2
+vs3 at vmes0 addr 0xffff5800 ipl 2
+vs4 at vmes0 addr 0xffff7000 ipl 2
+vs5 at vmes0 addr 0xffff7800 ipl 2
+# MVME332XT
vx0 at vmes0 addr 0xff780000 ipl 3
vx1 at vmes0 addr 0xff790000 ipl 3
vx2 at vmes0 addr 0xff7a0000 ipl 3
vx3 at vmes0 addr 0xff7b0000 ipl 3
+# MVME376
le0 at vmes0 addr 0xffff1200 ipl 3
le1 at vmes0 addr 0xffff1400 ipl 3
le2 at vmes0 addr 0xffff1600 ipl 3
-vs0 at vmes0 addr 0xffff9000 ipl 2
-vs1 at vmes0 addr 0xffff9800 ipl 2
-vs2 at vmes0 addr 0xffff4800 ipl 2
-vs3 at vmes0 addr 0xffff5800 ipl 2
-vs4 at vmes0 addr 0xffff7000 ipl 2
-vs5 at vmes0 addr 0xffff7800 ipl 2
-# ------------------------------- vs0 devices --------------------------
scsibus* at vs?
+scsibus* at vsbic?
-# ------------------------------ scsibus devices -----------------------
sd* at scsibus?
st* at scsibus?
cd* at scsibus?
+ch* at scsibus?
+ss* at scsibus?
+safte* at scsibus?
+ses* at scsibus?
+uk* at scsibus?
diff --git a/sys/arch/mvme88k/conf/M197 b/sys/arch/mvme88k/conf/M197
index 9a6cdb89884..bbff7688177 100644
--- a/sys/arch/mvme88k/conf/M197
+++ b/sys/arch/mvme88k/conf/M197
@@ -1,63 +1,75 @@
-# $OpenBSD: M197,v 1.31 2006/05/28 11:09:56 miod Exp $
+# $OpenBSD: M197,v 1.32 2009/02/14 17:42:00 miod Exp $
+#
+# For further information on compiling OpenBSD kernels, see the config(8)
+# man page.
+#
+# For further information on hardware support for this architecture, see
+# the intro(4) man page. For further information about kernel options
+# for this architecture, see the options(4) man page. For an explanation
+# of each device driver in this file see the section 4 man page for the
+# device.
-machine mvme88k m88k
-
-include "../../../conf/GENERIC"
+machine mvme88k m88k
+include "../../../conf/GENERIC"
+maxusers 32 # estimated number of users
# Processor type
option M88110
-option MVME197 # support for 197 (requires M88110)
+option MVME197 # support for 197 (requires M88110)
-maxusers 64
+config bsd swap generic
-config bsd swap on generic
+#
+# devices
+#
-# ------------------------------ devices --------------------------------
mainbus0 at root
-# ------------------------------ mainbus devices ------------------------
+# MVME1x7 devices
bussw0 at mainbus0 addr 0xfff00000
-
-# ----------------------------- busswitch devices -----------------------
pcctwo0 at bussw0 offset 0x00000
-
-# ------------------------------ pcctwo devices -------------------------
-vme0 at pcctwo0 offset 0x40000
nvram0 at pcctwo0 offset 0xc0000
+vme0 at pcctwo0 offset 0x40000
ie0 at pcctwo0 offset 0x46000 ipl 3
osiop0 at pcctwo0 offset 0x47000 ipl 2
cl0 at pcctwo0 offset 0x45000 ipl 3
-#lptwo0 at pcctwo0 addr 0x45000 ipl 1
-#memc0 at pcctwo0 addr 0x43000
-#memc1 at pcctwo0 addr 0x43100
+#lptwo0 at pcctwo0 offset 0x45000 ipl 1
+memc0 at pcctwo0 offset 0x43000
+memc1 at pcctwo0 offset 0x43100
-# ------------------------------ vme0 devices --------------------------
vmes0 at vme0
vmel0 at vme0
-# ------------------------------ vmes0 devices -------------------------
+# MVME327
+vsbic0 at vmes0 addr 0xffffa600 ipl 2
+vsbic1 at vmes0 addr 0xffffa700 ipl 2
+# MVME328, MVME328XT
+vs0 at vmes0 addr 0xffff9000 ipl 2
+vs1 at vmes0 addr 0xffff9800 ipl 2
+vs2 at vmes0 addr 0xffff4800 ipl 2
+vs3 at vmes0 addr 0xffff5800 ipl 2
+vs4 at vmes0 addr 0xffff7000 ipl 2
+vs5 at vmes0 addr 0xffff7800 ipl 2
+# MVME332XT
vx0 at vmes0 addr 0xff780000 ipl 3
vx1 at vmes0 addr 0xff790000 ipl 3
vx2 at vmes0 addr 0xff7a0000 ipl 3
vx3 at vmes0 addr 0xff7b0000 ipl 3
+# MVME376
le0 at vmes0 addr 0xffff1200 ipl 3
le1 at vmes0 addr 0xffff1400 ipl 3
le2 at vmes0 addr 0xffff1600 ipl 3
-vs0 at vmes0 addr 0xffff9000 ipl 2
-vs1 at vmes0 addr 0xffff9800 ipl 2
-vs2 at vmes0 addr 0xffff4800 ipl 2
-vs3 at vmes0 addr 0xffff5800 ipl 2
-vs4 at vmes0 addr 0xffff7000 ipl 2
-vs5 at vmes0 addr 0xffff7800 ipl 2
-# ------------------------------- vs0 devices --------------------------
-scsibus* at vs?
-
-# ----------------------------- osiop0 devices -------------------------
scsibus* at osiop?
+scsibus* at vs?
+scsibus* at vsbic?
-# ------------------------------ scsibus? devices ----------------------
sd* at scsibus?
st* at scsibus?
cd* at scsibus?
+ch* at scsibus?
+ss* at scsibus?
+safte* at scsibus?
+ses* at scsibus?
+uk* at scsibus?