summaryrefslogtreecommitdiff
path: root/sys/arch/mvme68k/conf
diff options
context:
space:
mode:
authorSteve Murphree <smurph@cvs.openbsd.org>2000-01-06 03:21:45 +0000
committerSteve Murphree <smurph@cvs.openbsd.org>2000-01-06 03:21:45 +0000
commit05427f7693924705096cbb84ffb757417d35f141 (patch)
tree6bd150139cec0d1d7336e8e6fbadb576ea50a08d /sys/arch/mvme68k/conf
parentb349c2901026285386ff85dff9f4cae23fa52900 (diff)
Added support for MVME177 (mc68060)
Diffstat (limited to 'sys/arch/mvme68k/conf')
-rw-r--r--sys/arch/mvme68k/conf/GENERIC11
-rw-r--r--sys/arch/mvme68k/conf/Makefile.mvme68k17
2 files changed, 21 insertions, 7 deletions
diff --git a/sys/arch/mvme68k/conf/GENERIC b/sys/arch/mvme68k/conf/GENERIC
index ba6d5817228..a069a1f9621 100644
--- a/sys/arch/mvme68k/conf/GENERIC
+++ b/sys/arch/mvme68k/conf/GENERIC
@@ -1,18 +1,21 @@
-# $OpenBSD: GENERIC,v 1.9 1997/03/31 00:23:50 downsj Exp $
+# $OpenBSD: GENERIC,v 1.10 2000/01/06 03:21:42 smurph Exp $
machine mvme68k m68k
include "../../../conf/GENERIC"
-#option M68060 # support for 060
+option M68030 # support for 030
option M68040 # support for 040
+option M68060 # support for 060
option FPSP # MC68040 floating point support
-option M68030 # support for 030
+option M060SP # ...and MC68060 support package
+option FPU_EMULATE # FPU emulation
option MVME147 # (requires M68030)
option MVME162 # (requires M68040, FPSP)
option MVME167 # includes 166 (requires M68040, FPSP)
-#option MVME177 # (requires M68060, ...)
+option MVME172 # (requires M68060, 060SP, FPSP)
+option MVME177 # (requires M68060, 060SP, FPSP)
option COMPAT_SUNOS
option COMPAT_HPUX
diff --git a/sys/arch/mvme68k/conf/Makefile.mvme68k b/sys/arch/mvme68k/conf/Makefile.mvme68k
index 707250b1ecc..ae4afbc69ef 100644
--- a/sys/arch/mvme68k/conf/Makefile.mvme68k
+++ b/sys/arch/mvme68k/conf/Makefile.mvme68k
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.mvme68k,v 1.9 1997/09/15 02:40:31 deraadt Exp $
+# $OpenBSD: Makefile.mvme68k,v 1.10 2000/01/06 03:21:42 smurph Exp $
# This makefile is constructed from a machine description:
# config machineid
@@ -33,7 +33,15 @@ MVME68K=../..
INCLUDES= -I. -I$S/arch -I$S -nostdinc
CPPFLAGS= ${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL -Dmvme68k
CWARNFLAGS= -Werror
-CFLAGS= ${DEBUG} ${COPTS} ${CWARNFLAGS} -msoft-float
+
+.if empty(IDENT:M-DM68060)
+CMACHFLAGS= -m68020
+.else
+CMACHFLAGS= -m68060 -Wa,-m68030
+.endif
+CMACHFLAGS+= -msoft-float
+
+CFLAGS= ${DEBUG} ${CWARNFLAGS} ${COPTS} ${CMACHFLAGS}
AFLAGS= -x assembler-with-cpp -traditional-cpp -D_LOCORE
LINKFLAGS= -Ttext 0x10000 -z -e start
STRIPFLAGS= -d
@@ -61,6 +69,9 @@ LIBCOMPAT= ${COMPATLIB_PROF}
### for the Motorola 68040 Floating Point Software Product
.include "$S/arch/m68k/fpsp/Makefile.inc"
+### for the Motorola 68060 Support Package
+.include "$S/arch/m68k/060sp/Makefile.inc"
+
# compile rules: rules are named ${TYPE}_${SUFFIX} where TYPE is NORMAL or
# HOSTED}, and SUFFIX is the file suffix, capitalized (e.g. C for a .c file).
@@ -80,7 +91,7 @@ HOSTED_C= ${HOSTCC} ${HOSTED_CFLAGS} ${HOSTED_CPPFLAGS} -c $<
# ${SYSTEM_LD_HEAD}
# ${SYSTEM_LD} swapxxx.o
# ${SYSTEM_LD_TAIL}
-SYSTEM_OBJ= locore.o ${FPSP} \
+SYSTEM_OBJ= locore.o ${FPSP} ${060SP}\
param.o ioconf.o ${OBJS} ${LIBKERN} ${LIBCOMPAT}
SYSTEM_DEP= Makefile ${SYSTEM_OBJ}
SYSTEM_LD_HEAD= @rm -f $@