make it work

diff --git a/sys/arch/mvme68k/include/cpu.h b/sys/arch/mvme68k/include/cpu.h
index 318b3ca..492e23d 100644 (file)
--- a/sys/arch/mvme68k/include/cpu.h
+++ b/sys/arch/mvme68k/include/cpu.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: cpu.h,v 1.4 1996/04/28 10:56:07 deraadt Exp $ */
+/*     $OpenBSD: cpu.h,v 1.5 1997/02/10 17:49:09 deraadt Exp $ */
 
 /*
  * Copyright (c) 1995 Theo de Raadt
@@ -75,6 +75,9 @@
  * Exported definitions unique to mvme68k/68k cpu support.
  */
 
+#define M68K_MMU_MOTOROLA
+#include <m68k/cpu.h>
+
 /*
  * definitions of cpu-dependent requirements
  * referenced in generic code

diff --git a/sys/arch/mvme68k/mvme68k/genassym.c b/sys/arch/mvme68k/mvme68k/genassym.c
index 837b800..7deeb6f 100644 (file)
--- a/sys/arch/mvme68k/mvme68k/genassym.c
+++ b/sys/arch/mvme68k/mvme68k/genassym.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: genassym.c,v 1.3 1996/04/28 10:57:44 deraadt Exp $ */
+/*     $OpenBSD: genassym.c,v 1.4 1997/02/10 17:49:11 deraadt Exp $ */
 
 /*
  * Copyright (c) 1995 Theo de Raadt
@@ -273,6 +273,11 @@ main()
        def("MMU_68030", MMU_68030);
        def("MMU_68040", MMU_68040);
 
+       def("CPU_68020", CPU_68020);
+       def("CPU_68030", CPU_68030);
+       def("CPU_68040", CPU_68040);
+       def("CPU_68060", CPU_68060);
+
        off("NETCTRL_DEV", struct prom_netctrl, dev);
        off("NETCTRL_CTRL", struct prom_netctrl, ctrl);
        off("NETCTRL_CMD", struct prom_netctrl, cmd);

diff --git a/sys/arch/mvme68k/mvme68k/locore.s b/sys/arch/mvme68k/mvme68k/locore.s
index 5e9120d..b3d8ffc 100644 (file)
--- a/sys/arch/mvme68k/mvme68k/locore.s
+++ b/sys/arch/mvme68k/mvme68k/locore.s
@@ -1,4 +1,4 @@
-/*     $OpenBSD: locore.s,v 1.14 1997/02/10 11:39:25 downsj Exp $ */
+/*     $OpenBSD: locore.s,v 1.15 1997/02/10 17:49:12 deraadt Exp $ */
 
 /*
  * Copyright (c) 1995 Theo de Raadt
@@ -200,6 +200,9 @@ is147:
        RELOC(_mmutype, a0)             | no, we have 68030
        movl    #MMU_68030,a0@          | set to reflect 68030 PMMU
 
+       RELOC(_cputype, a0)             | no, we have 68030
+       movl    #CPU_68030,a0@          | set to reflect 68030 CPU
+
        movl    #CACHE_OFF,d0
        movc    d0,cacr                 | clear and disable on-chip cache(s)
 
@@ -240,6 +243,9 @@ is162:
        RELOC(_mmutype, a0)
        movl    #MMU_68040,a0@          | with a 68040 MMU
 
+       RELOC(_cputype, a0)             | no, we have 68040
+       movl    #CPU_68040,a0@          | set to reflect 68040 CPU
+
        bra     is16x
 #endif
 
@@ -255,6 +261,9 @@ is167:
        RELOC(_mmutype, a0)
        movl    #MMU_68040,a0@          | with a 68040 MMU
 
+       RELOC(_cputype, a0)             | no, we have 68040
+       movl    #CPU_68040,a0@          | set to reflect 68040 CPU
+
        bra     is16x
 #endif
 
@@ -268,7 +277,10 @@ is177:
        movl    d0, d2
 
        RELOC(_mmutype, a0)
-       movl    #MMU_68040,a0@          | XXX TDR FIX FIX with a 68060 MMU
+       movl    #MMU_68060,a0@          | with a 68060 MMU
+
+       RELOC(_cputype, a0)             | no, we have 68060
+       movl    #CPU_68060,a0@          | set to reflect 68060 CPU
 
        bra     is16x
 #endif
@@ -1869,9 +1881,11 @@ not147:
        /*NOTREACHED*/
 
        .data
-       .globl  _mmutype,_protorp
+       .globl  _mmutype,_protorp, _cputype
 _mmutype:
        .long   MMU_68030       | default to MMU_68030
+_cputype:
+       .long   CPU_68030       | default to CPU_68030
 _protorp:
        .long   0,0             | prototype root pointer
        .globl  _cold