diff options
Diffstat (limited to 'sys/arch/mvme88k/conf')
| -rw-r--r-- | sys/arch/mvme88k/conf/GENERIC | 33 | ||||
| -rw-r--r-- | sys/arch/mvme88k/conf/M187 | 5 | ||||
| -rw-r--r-- | sys/arch/mvme88k/conf/M188 | 5 | ||||
| -rw-r--r-- | sys/arch/mvme88k/conf/M197 | 5 | ||||
| -rw-r--r-- | sys/arch/mvme88k/conf/RAMDISK | 8 | ||||
| -rw-r--r-- | sys/arch/mvme88k/conf/files.mvme88k | 8 |
6 files changed, 23 insertions, 41 deletions
diff --git a/sys/arch/mvme88k/conf/GENERIC b/sys/arch/mvme88k/conf/GENERIC index 6e6232becd4..32e99c48c29 100644 --- a/sys/arch/mvme88k/conf/GENERIC +++ b/sys/arch/mvme88k/conf/GENERIC @@ -1,6 +1,6 @@ -# $OpenBSD: GENERIC,v 1.33 2003/08/01 07:43:01 miod Exp $ +# $OpenBSD: GENERIC,v 1.34 2003/10/11 22:06:48 miod Exp $ -machine mvme88k +machine mvme88k include "../../../conf/GENERIC" @@ -10,10 +10,9 @@ option MVME197 # support for 197 option "NCPUS=1" # number of CPUs supported (max 4) option BUGMAP # use the Bug ROM VME mappings #option DEBUG # print debugging statements -#option EH_DEBUG # debugging code for exception handlers # Define this if your processor has the xxx.usr bug (mask C82N) -option ERRATA__XXX_USR +option ERRATA__XXX_USR maxusers 64 @@ -25,18 +24,13 @@ config bsd swap generic mainbus0 at root -# ------------------------------ mainbus devices ------------------------ bugtty0 at mainbus0 -pcctwo0 at mainbus0 addr 0xfff00000 -syscon0 at mainbus0 addr 0xfff00000 -bussw0 at mainbus0 addr 0xfff00000 -# ------------------------------ bussw devices -------------------------- -pcctwo0 at bussw0 offset 0x42000 - -# ------------------------------ pcctwo devices ------------------------- +# MVME1x7 devices +pcctwo0 at mainbus0 addr 0xfff00000 # MVME187 +bussw0 at mainbus0 addr 0xfff00000 # MVME197 +pcctwo0 at bussw0 offset 0x42000 # MVME197 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 1 @@ -46,18 +40,16 @@ cl0 at pcctwo0 offset 0x45000 ipl 3 memc0 at pcctwo0 offset 0x43000 memc1 at pcctwo0 offset 0x43100 -# ------------------------------ syscon0 devices ------------------------ +# MVME188 devices +syscon0 at mainbus0 addr 0xfff00000 # MVME188 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 len 0x10000 vx1 at vmes0 addr 0xff790000 ipl 3 len 0x10000 vx2 at vmes0 addr 0xff7a0000 ipl 3 len 0x10000 @@ -72,13 +64,12 @@ vs3 at vmes0 addr 0xffff5800 ipl 2 len 0x800 vs4 at vmes0 addr 0xffff7000 ipl 2 len 0x800 vs5 at vmes0 addr 0xffff7800 ipl 2 len 0x800 -# ------------------------------- vs0 devices -------------------------- scsibus* at vs? - -# ------------------------------ ssh0 devices -------------------------- scsibus* at ssh? -# ------------------------------ scsibus0 devices ---------------------- sd* at scsibus? target ? lun ? st* at scsibus? target ? lun ? cd* at scsibus? target ? lun ? +ch* at scsibus? target ? lun ? +ss* at scsibus? target ? lun ? +uk* at scsibus? target ? lun ? diff --git a/sys/arch/mvme88k/conf/M187 b/sys/arch/mvme88k/conf/M187 index f6e02dce277..6668dffde27 100644 --- a/sys/arch/mvme88k/conf/M187 +++ b/sys/arch/mvme88k/conf/M187 @@ -1,4 +1,4 @@ -# $OpenBSD: M187,v 1.21 2003/08/01 07:43:01 miod Exp $ +# $OpenBSD: M187,v 1.22 2003/10/11 22:06:48 miod Exp $ machine mvme88k @@ -10,7 +10,7 @@ option BUGMAP # use Bug Rom VME Mappings #option EH_DEBUG # debugging code for exception handlers # Define this if your processor has the xxx.usr bug (mask C82N) -option ERRATA__XXX_USR +option ERRATA__XXX_USR maxusers 64 @@ -25,7 +25,6 @@ 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 diff --git a/sys/arch/mvme88k/conf/M188 b/sys/arch/mvme88k/conf/M188 index f34d4c34f73..602d1192e17 100644 --- a/sys/arch/mvme88k/conf/M188 +++ b/sys/arch/mvme88k/conf/M188 @@ -1,4 +1,4 @@ -# $OpenBSD: M188,v 1.16 2001/12/22 18:22:38 smurph Exp $ +# $OpenBSD: M188,v 1.17 2003/10/11 22:06:48 miod Exp $ machine mvme88k @@ -11,7 +11,7 @@ option BUGMAP # use Bug Rom VME Mappings #option EH_DEBUG # debugging code for exception handlers # Define this if your processor has the xxx.usr bug (mask C82N) -option ERRATA__XXX_USR +option ERRATA__XXX_USR maxusers 64 @@ -26,7 +26,6 @@ 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 diff --git a/sys/arch/mvme88k/conf/M197 b/sys/arch/mvme88k/conf/M197 index 2f4e633d1f1..ec4f05be27a 100644 --- a/sys/arch/mvme88k/conf/M197 +++ b/sys/arch/mvme88k/conf/M197 @@ -1,4 +1,4 @@ -# $OpenBSD: M197,v 1.17 2003/01/04 16:20:30 miod Exp $ +# $OpenBSD: M197,v 1.18 2003/10/11 22:06:48 miod Exp $ machine mvme88k @@ -11,7 +11,7 @@ option BUGMAP # use Bug Rom VME Mappings #option EH_DEBUG # debugging code for exception handlers # Define this if your processor has the xxx.usr bug (mask C82N) -option ERRATA__XXX_USR +option ERRATA__XXX_USR maxusers 64 @@ -29,7 +29,6 @@ pcctwo0 at bussw0 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 diff --git a/sys/arch/mvme88k/conf/RAMDISK b/sys/arch/mvme88k/conf/RAMDISK index d86d5d48b30..879562f39a6 100644 --- a/sys/arch/mvme88k/conf/RAMDISK +++ b/sys/arch/mvme88k/conf/RAMDISK @@ -1,6 +1,6 @@ -# $OpenBSD: RAMDISK,v 1.13 2003/08/09 21:19:58 miod Exp $ +# $OpenBSD: RAMDISK,v 1.14 2003/10/11 22:06:48 miod Exp $ -machine mvme88k +machine mvme88k # 2 meg ramdisk option MINIROOTSIZE=4096 @@ -14,7 +14,7 @@ option "NCPUS=1" # number of CPUs supported (max 4) option BUGMAP # use the Bug ROM VME mappings # Define this if your processor has the xxx.usr bug (mask C82N) -option ERRATA__XXX_USR +option ERRATA__XXX_USR maxusers 32 @@ -42,7 +42,6 @@ syscon0 at mainbus0 addr 0xfff00000 pcctwo0 at bussw0 offset 0x42000 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 @@ -50,7 +49,6 @@ ssh0 at pcctwo0 offset 0x47000 ipl 2 cl0 at pcctwo0 offset 0x45000 ipl 3 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 diff --git a/sys/arch/mvme88k/conf/files.mvme88k b/sys/arch/mvme88k/conf/files.mvme88k index 5140a9b6329..5e6deec8a94 100644 --- a/sys/arch/mvme88k/conf/files.mvme88k +++ b/sys/arch/mvme88k/conf/files.mvme88k @@ -1,5 +1,5 @@ -# $OpenBSD: files.mvme88k,v 1.20 2003/01/14 03:20:12 miod Exp $ -# +# $OpenBSD: files.mvme88k,v 1.21 2003/10/11 22:06:48 miod Exp $ +# maxpartitions 16 device mainbus { [addr = -1 ] } @@ -30,10 +30,6 @@ device clock 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 |