diff options
Diffstat (limited to 'sys/arch/mvme88k/conf')
| -rw-r--r-- | sys/arch/mvme88k/conf/GENERIC | 10 | ||||
| -rw-r--r-- | sys/arch/mvme88k/conf/M187 | 6 | ||||
| -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/Makefile.mvme88k | 16 |
5 files changed, 25 insertions, 17 deletions
diff --git a/sys/arch/mvme88k/conf/GENERIC b/sys/arch/mvme88k/conf/GENERIC index fb9614dc51a..b80e83a98a0 100644 --- a/sys/arch/mvme88k/conf/GENERIC +++ b/sys/arch/mvme88k/conf/GENERIC @@ -1,14 +1,12 @@ -# $OpenBSD: GENERIC,v 1.29 2001/12/22 17:58:31 smurph Exp $ +# $OpenBSD: GENERIC,v 1.30 2001/12/22 18:22:38 smurph Exp $ machine mvme88k include "../../../conf/GENERIC" -option M88100 # support for mc88110 processor -option M88110 # support for mc88110 processor -option MVME187 # support for 187 (M88100 required) -option MVME188 # support for 188 (M88100 required) -option MVME197 # support for 197 (M88110 required) +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 the Bug ROM VME mappings #option DEBUG # print debugging statements diff --git a/sys/arch/mvme88k/conf/M187 b/sys/arch/mvme88k/conf/M187 index ad8e1a97614..8e1d38a560a 100644 --- a/sys/arch/mvme88k/conf/M187 +++ b/sys/arch/mvme88k/conf/M187 @@ -1,12 +1,10 @@ -# $OpenBSD: M187,v 1.18 2001/12/19 07:04:41 smurph Exp $ +# $OpenBSD: M187,v 1.19 2001/12/22 18:22:38 smurph Exp $ machine mvme88k include "../../../conf/GENERIC" -option M88100 # support for mc88110 processor -option MVME187 # support for 187 (M88100 required) -option "NCPUS=1" # Number of cpus supported (max 4) +option MVME187 # support for 187 option BUGMAP # use Bug Rom VME Mappings #option DEBUG # print debugging statements #option EH_DEBUG # debugging code for exception handlers diff --git a/sys/arch/mvme88k/conf/M188 b/sys/arch/mvme88k/conf/M188 index 00918c29935..f34d4c34f73 100644 --- a/sys/arch/mvme88k/conf/M188 +++ b/sys/arch/mvme88k/conf/M188 @@ -1,11 +1,10 @@ -# $OpenBSD: M188,v 1.15 2001/12/19 07:04:41 smurph Exp $ +# $OpenBSD: M188,v 1.16 2001/12/22 18:22:38 smurph Exp $ machine mvme88k include "../../../conf/GENERIC" -option M88100 # support for mc88110 processor -option MVME188 # support for 188 (M88100 required) +option MVME188 # support for 188 option "NCPUS=1" # Number of cpus supported (max 4) option BUGMAP # use Bug Rom VME Mappings #option DEBUG # print debugging statements diff --git a/sys/arch/mvme88k/conf/M197 b/sys/arch/mvme88k/conf/M197 index 8209274535d..d74e89c0202 100644 --- a/sys/arch/mvme88k/conf/M197 +++ b/sys/arch/mvme88k/conf/M197 @@ -1,11 +1,10 @@ -# $OpenBSD: M197,v 1.14 2001/12/19 07:04:41 smurph Exp $ +# $OpenBSD: M197,v 1.15 2001/12/22 18:22:38 smurph Exp $ machine mvme88k include "../../../conf/GENERIC" -option M88110 # support for mc88110 processor -option MVME197 # support for 197 (M88110 required) +option MVME197 # support for 197 option "NCPUS=1" # Number of cpus supported (max 4) option BUGMAP # use Bug Rom VME Mappings #option DEBUG # print debugging statements diff --git a/sys/arch/mvme88k/conf/Makefile.mvme88k b/sys/arch/mvme88k/conf/Makefile.mvme88k index 9b5fa1cdc43..f806977a357 100644 --- a/sys/arch/mvme88k/conf/Makefile.mvme88k +++ b/sys/arch/mvme88k/conf/Makefile.mvme88k @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.mvme88k,v 1.16 2001/12/16 23:49:43 miod Exp $ +# $OpenBSD: Makefile.mvme88k,v 1.17 2001/12/22 18:22:38 smurph Exp $ # # Makefile for OpenBSD # @@ -54,6 +54,20 @@ HOSTCC?= ${CC} HOSTED_CPPFLAGS?=${CPPFLAGS:S/^-nostdinc$//} HOSTED_CFLAGS?= ${CFLAGS} +### CPU configuration + +.if (${IDENT:M-DMVME187} != "" || ${IDENT:M-DMVME188} != "") +CPPFLAGS+= -DM88100 +.endif +.if (${IDENT:M-DMVME197} != "") +CPPFLAGS+= -DM88110 +.endif + +# syntaxic sugar for 187, which do not exist with multiple processors +.if (${IDENT:M-DMVME187} != "" && ${IDENT:M-DNCPUS} == "") +CPPFLAGS+= -DNCPUS=1 +.endif + ### find out what to use for libkern .include "$S/lib/libkern/Makefile.inc" .ifndef PROF |