Module Name: src
Committed By: thorpej
Date: Thu Jan 18 14:39:07 UTC 2024
Modified Files:
src/sys/arch/amiga/conf: std.amiga
src/sys/arch/amiga/include: cpu.h
src/sys/arch/atari/include: cpu.h
src/sys/arch/cesfic/include: cpu.h
src/sys/arch/evbcf/include: cpu.h
src/sys/arch/hp300/conf: files.hp300
src/sys/arch/hp300/include: hp300spu.h
src/sys/arch/luna68k/include: cpu.h
src/sys/arch/m68k/conf: files.m68k
src/sys/arch/m68k/include: cpu.h
src/sys/arch/m68k/m68k: pmap_motorola.c
src/sys/arch/mac68k/conf: std.mac68k
src/sys/arch/mac68k/include: cpu.h
src/sys/arch/mvme68k/include: cpu.h
src/sys/arch/news68k/include: cpu.h
src/sys/arch/next68k/include: cpu.h
src/sys/arch/sun2/conf: std.sun2
src/sys/arch/sun3/conf: std.sun3
src/sys/arch/virt68k/include: cpu.h
src/sys/arch/x68k/include: cpu.h
Log Message:
Make the M68K_MMU_* defines real kernel options, available in opt_m68k_arch.h.
For 68030, 68040, and 68060, infer M68K_MMU_MOTOROLA. For 68010 and 68020, it
must be an explicit option (set in std.${MACHINE} or, in the case of hp300,
inferred from the specific model option).
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/amiga/conf/std.amiga
cvs rdiff -u -r1.84 -r1.85 src/sys/arch/amiga/include/cpu.h
cvs rdiff -u -r1.75 -r1.76 src/sys/arch/atari/include/cpu.h
cvs rdiff -u -r1.35 -r1.36 src/sys/arch/cesfic/include/cpu.h
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbcf/include/cpu.h
cvs rdiff -u -r1.96 -r1.97 src/sys/arch/hp300/conf/files.hp300
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/hp300/include/hp300spu.h
cvs rdiff -u -r1.40 -r1.41 src/sys/arch/luna68k/include/cpu.h
cvs rdiff -u -r1.56 -r1.57 src/sys/arch/m68k/conf/files.m68k
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/m68k/include/cpu.h
cvs rdiff -u -r1.87 -r1.88 src/sys/arch/m68k/m68k/pmap_motorola.c
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/mac68k/conf/std.mac68k
cvs rdiff -u -r1.103 -r1.104 src/sys/arch/mac68k/include/cpu.h
cvs rdiff -u -r1.54 -r1.55 src/sys/arch/mvme68k/include/cpu.h
cvs rdiff -u -r1.52 -r1.53 src/sys/arch/news68k/include/cpu.h
cvs rdiff -u -r1.55 -r1.56 src/sys/arch/next68k/include/cpu.h
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/sun2/conf/std.sun2
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/sun3/conf/std.sun3
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/virt68k/include/cpu.h
cvs rdiff -u -r1.64 -r1.65 src/sys/arch/x68k/include/cpu.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amiga/conf/std.amiga
diff -u src/sys/arch/amiga/conf/std.amiga:1.22 src/sys/arch/amiga/conf/std.amiga:1.23
--- src/sys/arch/amiga/conf/std.amiga:1.22 Sun Sep 19 02:09:27 2010
+++ src/sys/arch/amiga/conf/std.amiga Thu Jan 18 14:39:05 2024
@@ -1,4 +1,4 @@
-# $NetBSD: std.amiga,v 1.22 2010/09/19 02:09:27 tsutsui Exp $
+# $NetBSD: std.amiga,v 1.23 2024/01/18 14:39:05 thorpej Exp $
# standard amiga information
@@ -6,6 +6,15 @@ machine amiga m68k
include "conf/std" # MI standard options
include "arch/m68k/conf/std.m68k" # m68k standard options
+# All Amigas that NetBSD runs on have a Motorola MMU. For 68030, 68040,
+# and 68060, this is inferred from the CPU. But if the kernel only includes
+# support for 68020, we have to be explicit about it.
+#
+# XXX config(1) needs something like this:
+#
+# ifoption M68020: M68K_MMU_68851
+options M68K_MMU_MOTOROLA
+
mainbus0 at root
clock0 at mainbus0
Index: src/sys/arch/amiga/include/cpu.h
diff -u src/sys/arch/amiga/include/cpu.h:1.84 src/sys/arch/amiga/include/cpu.h:1.85
--- src/sys/arch/amiga/include/cpu.h:1.84 Tue Jan 9 04:16:23 2024
+++ src/sys/arch/amiga/include/cpu.h Thu Jan 18 14:39:05 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.84 2024/01/09 04:16:23 thorpej Exp $ */
+/* $NetBSD: cpu.h,v 1.85 2024/01/18 14:39:05 thorpej Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -51,11 +51,6 @@
#include <m68k/cpu.h>
#if defined(_KERNEL)
-/*
- * Exported definitions unique to amiga/68k cpu support.
- */
-#define M68K_MMU_MOTOROLA
-
extern volatile unsigned int interrupt_depth;
/*
* Arguments to hardclock and gatherstats encapsulate the previous
Index: src/sys/arch/atari/include/cpu.h
diff -u src/sys/arch/atari/include/cpu.h:1.75 src/sys/arch/atari/include/cpu.h:1.76
--- src/sys/arch/atari/include/cpu.h:1.75 Tue Jan 9 04:16:23 2024
+++ src/sys/arch/atari/include/cpu.h Thu Jan 18 14:39:05 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.75 2024/01/09 04:16:23 thorpej Exp $ */
+/* $NetBSD: cpu.h,v 1.76 2024/01/18 14:39:05 thorpej Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -51,11 +51,6 @@
#include <m68k/cpu.h>
#if defined(_KERNEL)
-/*
- * Exported definitions unique to atari/68k cpu support.
- */
-#define M68K_MMU_MOTOROLA
-
void cpu_proc_fork(struct proc *, struct proc *);
/*
Index: src/sys/arch/cesfic/include/cpu.h
diff -u src/sys/arch/cesfic/include/cpu.h:1.35 src/sys/arch/cesfic/include/cpu.h:1.36
--- src/sys/arch/cesfic/include/cpu.h:1.35 Mon Jan 15 03:07:14 2024
+++ src/sys/arch/cesfic/include/cpu.h Thu Jan 18 14:39:05 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.35 2024/01/15 03:07:14 thorpej Exp $ */
+/* $NetBSD: cpu.h,v 1.36 2024/01/18 14:39:05 thorpej Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -43,7 +43,6 @@
#if defined(_KERNEL_OPT)
#include "opt_lockdebug.h"
-#include "opt_m68k_arch.h"
#endif
/*
@@ -102,14 +101,6 @@ struct clockframe {
extern int astpending; /* need to trap before returning to user mode */
#define aston() (astpending++)
-#ifndef M68040
-#define M68040
-#endif /* ! M68040 */
-
-#ifndef M68K_MMU_MOTOROLA
-#define M68K_MMU_MOTOROLA
-#endif /* ! M68K_MMU_MOTOROLA */
-
/* locore.s functions */
void doboot(void)
__attribute__((__noreturn__));
Index: src/sys/arch/evbcf/include/cpu.h
diff -u src/sys/arch/evbcf/include/cpu.h:1.6 src/sys/arch/evbcf/include/cpu.h:1.7
--- src/sys/arch/evbcf/include/cpu.h:1.6 Tue Jan 9 04:08:33 2024
+++ src/sys/arch/evbcf/include/cpu.h Thu Jan 18 14:39:06 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.6 2024/01/09 04:08:33 thorpej Exp $ */
+/* $NetBSD: cpu.h,v 1.7 2024/01/18 14:39:06 thorpej Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -43,7 +43,6 @@
#if defined(_KERNEL_OPT)
#include "opt_lockdebug.h"
-#include "opt_m68k_arch.h"
#endif
/*
Index: src/sys/arch/hp300/conf/files.hp300
diff -u src/sys/arch/hp300/conf/files.hp300:1.96 src/sys/arch/hp300/conf/files.hp300:1.97
--- src/sys/arch/hp300/conf/files.hp300:1.96 Thu Jan 18 03:40:48 2024
+++ src/sys/arch/hp300/conf/files.hp300 Thu Jan 18 14:39:06 2024
@@ -1,4 +1,4 @@
-# $NetBSD: files.hp300,v 1.96 2024/01/18 03:40:48 thorpej Exp $
+# $NetBSD: files.hp300,v 1.97 2024/01/18 14:39:06 thorpej Exp $
#
# hp300-specific configuration info
@@ -8,9 +8,9 @@ maxpartitions 8
maxusers 2 8 64
# SPU configuration options.
-defflag opt_spuconf.h HP320: M68020
-defflag opt_spuconf.h HP330: M68020
-defflag opt_spuconf.h HP350: M68020
+defflag opt_spuconf.h HP320: M68020, M68K_MMU_HP
+defflag opt_spuconf.h HP330: M68020, M68K_MMU_68851
+defflag opt_spuconf.h HP350: M68020, M68K_MMU_HP
defflag opt_spuconf.h HP340: M68030
defflag opt_spuconf.h HP345: M68030
Index: src/sys/arch/hp300/include/hp300spu.h
diff -u src/sys/arch/hp300/include/hp300spu.h:1.15 src/sys/arch/hp300/include/hp300spu.h:1.16
--- src/sys/arch/hp300/include/hp300spu.h:1.15 Thu Jan 18 03:40:48 2024
+++ src/sys/arch/hp300/include/hp300spu.h Thu Jan 18 14:39:06 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: hp300spu.h,v 1.15 2024/01/18 03:40:48 thorpej Exp $ */
+/* $NetBSD: hp300spu.h,v 1.16 2024/01/18 14:39:06 thorpej Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -90,17 +90,6 @@ extern int mmuid; /* MMU id */
#endif
/*
- * MMU configuration.
- */
-#if defined(HP320) || defined(HP350)
-#define M68K_MMU_HP
-#endif
-
-#if defined(HP330) || defined(M68030) || defined(M68040)
-#define M68K_MMU_MOTOROLA
-#endif
-
-/*
* Cache configuration.
*/
#if defined(M68K_MMU_HP)
Index: src/sys/arch/luna68k/include/cpu.h
diff -u src/sys/arch/luna68k/include/cpu.h:1.40 src/sys/arch/luna68k/include/cpu.h:1.41
--- src/sys/arch/luna68k/include/cpu.h:1.40 Mon Jan 15 02:16:52 2024
+++ src/sys/arch/luna68k/include/cpu.h Thu Jan 18 14:39:06 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.40 2024/01/15 02:16:52 thorpej Exp $ */
+/* $NetBSD: cpu.h,v 1.41 2024/01/18 14:39:06 thorpej Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -51,9 +51,6 @@
#include <m68k/cpu.h>
#if defined(_KERNEL)
-
-#define M68K_MMU_MOTOROLA
-
/*
* Arguments to hardclock and gatherstats encapsulate the previous
* machine state in an opaque clockframe. On the luna68k, we use
Index: src/sys/arch/m68k/conf/files.m68k
diff -u src/sys/arch/m68k/conf/files.m68k:1.56 src/sys/arch/m68k/conf/files.m68k:1.57
--- src/sys/arch/m68k/conf/files.m68k:1.56 Thu Jan 18 05:42:29 2024
+++ src/sys/arch/m68k/conf/files.m68k Thu Jan 18 14:39:06 2024
@@ -1,14 +1,25 @@
-# $NetBSD: files.m68k,v 1.56 2024/01/18 05:42:29 thorpej Exp $
+# $NetBSD: files.m68k,v 1.57 2024/01/18 14:39:06 thorpej Exp $
#
version 20240118 # mkflagvar
defflag opt_fpsp.h FPSP
+
+defflag opt_m68k_arch.h M68K_MMU_HP
+defflag opt_m68k_arch.h M68K_MMU_SUN
+defflag opt_m68k_arch.h M68K_MMU_SUN2: M68K_MMU_SUN
+defflag opt_m68k_arch.h M68K_MMU_SUN3: M68K_MMU_SUN
+defflag opt_m68k_arch.h M68K_MMU_MOTOROLA
+defflag opt_m68k_arch.h M68K_MMU_68851: M68K_MMU_MOTOROLA
+defflag opt_m68k_arch.h M68K_MMU_68030: M68K_MMU_MOTOROLA
+defflag opt_m68k_arch.h M68K_MMU_68040: M68K_MMU_MOTOROLA
+defflag opt_m68k_arch.h M68K_MMU_68060: M68K_MMU_MOTOROLA
+
defflag opt_m68k_arch.h M68010
defflag opt_m68k_arch.h M68020
-defflag opt_m68k_arch.h M68030
-defflag opt_m68k_arch.h M68040
-defflag opt_m68k_arch.h M68060
+defflag opt_m68k_arch.h M68030: M68K_MMU_68030
+defflag opt_m68k_arch.h M68040: M68K_MMU_68040
+defflag opt_m68k_arch.h M68060: M68K_MMU_68060
# Emit Makefile vars for these kernel options so that compiler flags
# can be tuned for CPU support.
Index: src/sys/arch/m68k/include/cpu.h
diff -u src/sys/arch/m68k/include/cpu.h:1.19 src/sys/arch/m68k/include/cpu.h:1.20
--- src/sys/arch/m68k/include/cpu.h:1.19 Wed Jan 3 12:46:12 2024
+++ src/sys/arch/m68k/include/cpu.h Thu Jan 18 14:39:06 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.19 2024/01/03 12:46:12 thorpej Exp $ */
+/* $NetBSD: cpu.h,v 1.20 2024/01/18 14:39:06 thorpej Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -41,6 +41,10 @@
#ifndef _M68K_CPU_H_
#define _M68K_CPU_H_
+#if defined(_KERNEL_OPT)
+#include "opt_m68k_arch.h" /* XXX Should not do this here. */
+#endif
+
/*
* Exported definitions common to Motorola m68k-based ports.
*
Index: src/sys/arch/m68k/m68k/pmap_motorola.c
diff -u src/sys/arch/m68k/m68k/pmap_motorola.c:1.87 src/sys/arch/m68k/m68k/pmap_motorola.c:1.88
--- src/sys/arch/m68k/m68k/pmap_motorola.c:1.87 Tue Jan 9 07:28:26 2024
+++ src/sys/arch/m68k/m68k/pmap_motorola.c Thu Jan 18 14:39:06 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap_motorola.c,v 1.87 2024/01/09 07:28:26 thorpej Exp $ */
+/* $NetBSD: pmap_motorola.c,v 1.88 2024/01/18 14:39:06 thorpej Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -120,7 +120,7 @@
#include "opt_m68k_arch.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap_motorola.c,v 1.87 2024/01/09 07:28:26 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap_motorola.c,v 1.88 2024/01/18 14:39:06 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -137,6 +137,10 @@ __KERNEL_RCSID(0, "$NetBSD: pmap_motorol
#include <m68k/cacheops.h>
+#if !defined(M68K_MMU_MOTOROLA) && !defined(M68K_MMU_HP)
+#error Hit the road, Jack...
+#endif
+
#ifdef DEBUG
#define PDB_FOLLOW 0x0001
#define PDB_INIT 0x0002
Index: src/sys/arch/mac68k/conf/std.mac68k
diff -u src/sys/arch/mac68k/conf/std.mac68k:1.30 src/sys/arch/mac68k/conf/std.mac68k:1.31
--- src/sys/arch/mac68k/conf/std.mac68k:1.30 Sun Sep 19 02:09:28 2010
+++ src/sys/arch/mac68k/conf/std.mac68k Thu Jan 18 14:39:06 2024
@@ -1,4 +1,4 @@
-# $NetBSD: std.mac68k,v 1.30 2010/09/19 02:09:28 tsutsui Exp $
+# $NetBSD: std.mac68k,v 1.31 2024/01/18 14:39:06 thorpej Exp $
#
# "options" common to all mac68k kernel configs
@@ -6,4 +6,13 @@ machine mac68k m68k
include "conf/std" # MI standard options
include "arch/m68k/conf/std.m68k" # m68k standard options
+# All 68k Macs that NetBSD runs on have a Motorola MMU. For 68030 and 68040,
+# this is inferred from the CPU. But if the kernel only includes support for
+# 68020, we have to be explicit about it.
+#
+# XXX config(1) needs something like this:
+#
+# ifoption M68020: M68K_MMU_68851
+options M68K_MMU_MOTOROLA
+
options HZ=60 # mac clock runs at 60hz
Index: src/sys/arch/mac68k/include/cpu.h
diff -u src/sys/arch/mac68k/include/cpu.h:1.103 src/sys/arch/mac68k/include/cpu.h:1.104
--- src/sys/arch/mac68k/include/cpu.h:1.103 Tue Jan 9 04:16:25 2024
+++ src/sys/arch/mac68k/include/cpu.h Thu Jan 18 14:39:07 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.103 2024/01/09 04:16:25 thorpej Exp $ */
+/* $NetBSD: cpu.h,v 1.104 2024/01/18 14:39:07 thorpej Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -71,11 +71,6 @@
#if defined(_KERNEL)
/*
- * Exported definitions unique to mac68k/68k cpu support.
- */
-#define M68K_MMU_MOTOROLA
-
-/*
* Get interrupt glue.
*/
#include <machine/intr.h>
Index: src/sys/arch/mvme68k/include/cpu.h
diff -u src/sys/arch/mvme68k/include/cpu.h:1.54 src/sys/arch/mvme68k/include/cpu.h:1.55
--- src/sys/arch/mvme68k/include/cpu.h:1.54 Thu Jan 18 05:12:30 2024
+++ src/sys/arch/mvme68k/include/cpu.h Thu Jan 18 14:39:07 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.54 2024/01/18 05:12:30 thorpej Exp $ */
+/* $NetBSD: cpu.h,v 1.55 2024/01/18 14:39:07 thorpej Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -43,8 +43,6 @@
#if defined(_KERNEL_OPT)
#include "opt_lockdebug.h"
-#include "opt_m68k_arch.h"
-#include "opt_mvmeconf.h"
#endif
/*
@@ -54,11 +52,6 @@
#if defined(_KERNEL)
/*
- * Exported definitions unique to mvme68k/68k cpu support.
- */
-#define M68K_MMU_MOTOROLA
-
-/*
* Arguments to hardclock and gatherstats encapsulate the previous
* machine state in an opaque clockframe. On the mvme68k, we use
* what the locore.s glue puts on the stack before calling C-code.
Index: src/sys/arch/news68k/include/cpu.h
diff -u src/sys/arch/news68k/include/cpu.h:1.52 src/sys/arch/news68k/include/cpu.h:1.53
--- src/sys/arch/news68k/include/cpu.h:1.52 Thu Jan 18 04:07:37 2024
+++ src/sys/arch/news68k/include/cpu.h Thu Jan 18 14:39:07 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.52 2024/01/18 04:07:37 thorpej Exp $ */
+/* $NetBSD: cpu.h,v 1.53 2024/01/18 14:39:07 thorpej Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -43,7 +43,6 @@
#if defined(_KERNEL_OPT)
#include "opt_lockdebug.h"
-#include "opt_m68k_arch.h"
#include "opt_newsconf.h"
#endif
@@ -130,10 +129,6 @@ extern volatile u_char *ctrl_ast;
#define aston() \
do { astpending++; *ctrl_ast = 0xff; } while (/* CONSTCOND */0)
-#if defined(news1700) || defined(news1200)
-#define M68K_MMU_MOTOROLA
-#endif
-
#if defined(news1700)
#define CACHE_HAVE_PAC
#endif
Index: src/sys/arch/next68k/include/cpu.h
diff -u src/sys/arch/next68k/include/cpu.h:1.55 src/sys/arch/next68k/include/cpu.h:1.56
--- src/sys/arch/next68k/include/cpu.h:1.55 Thu Jan 18 13:46:14 2024
+++ src/sys/arch/next68k/include/cpu.h Thu Jan 18 14:39:07 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.55 2024/01/18 13:46:14 thorpej Exp $ */
+/* $NetBSD: cpu.h,v 1.56 2024/01/18 14:39:07 thorpej Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -43,7 +43,6 @@
#if defined(_KERNEL_OPT)
#include "opt_lockdebug.h"
-#include "opt_m68k_arch.h"
#endif
/*
@@ -53,11 +52,6 @@
#if defined(_KERNEL)
/*
- * Exported definitions unique to next68k/68k cpu support.
- */
-#define M68K_MMU_MOTOROLA
-
-/*
* Get interrupt glue.
*/
#include <machine/intr.h>
Index: src/sys/arch/sun2/conf/std.sun2
diff -u src/sys/arch/sun2/conf/std.sun2:1.8 src/sys/arch/sun2/conf/std.sun2:1.9
--- src/sys/arch/sun2/conf/std.sun2:1.8 Thu Jan 18 05:13:48 2024
+++ src/sys/arch/sun2/conf/std.sun2 Thu Jan 18 14:39:07 2024
@@ -1,12 +1,13 @@
-# $NetBSD: std.sun2,v 1.8 2024/01/18 05:13:48 thorpej Exp $
+# $NetBSD: std.sun2,v 1.9 2024/01/18 14:39:07 thorpej Exp $
# Standard information for Sun2 machines.
machine sun2 m68k sun68k
include "conf/std" # MI standard options
include "arch/m68k/conf/std.m68k" # m68k standard options
-# All sun2 systems have a 68010.
+# All sun2 systems have a 68010 with Sun2 MMU
options M68010
+options M68K_MMU_SUN2
# XXX temporary option until sun3 port migrates to all sun68k stuff
options _SUN2_
Index: src/sys/arch/sun3/conf/std.sun3
diff -u src/sys/arch/sun3/conf/std.sun3:1.34 src/sys/arch/sun3/conf/std.sun3:1.35
--- src/sys/arch/sun3/conf/std.sun3:1.34 Sun Sep 19 02:09:29 2010
+++ src/sys/arch/sun3/conf/std.sun3 Thu Jan 18 14:39:07 2024
@@ -1,4 +1,4 @@
-# $NetBSD: std.sun3,v 1.34 2010/09/19 02:09:29 tsutsui Exp $
+# $NetBSD: std.sun3,v 1.35 2024/01/18 14:39:07 thorpej Exp $
# Standard information for Sun3 machines.
machine sun3 m68k sun68k
@@ -11,6 +11,7 @@ include "arch/m68k/conf/std.m68k" # m68
makeoptions MACHTYPE=sun3
options _SUN3_
options M68020
+options M68K_MMU_SUN3
# The root node (required)
mainbus0 at root
Index: src/sys/arch/virt68k/include/cpu.h
diff -u src/sys/arch/virt68k/include/cpu.h:1.4 src/sys/arch/virt68k/include/cpu.h:1.5
--- src/sys/arch/virt68k/include/cpu.h:1.4 Tue Jan 9 04:16:27 2024
+++ src/sys/arch/virt68k/include/cpu.h Thu Jan 18 14:39:07 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.4 2024/01/09 04:16:27 thorpej Exp $ */
+/* $NetBSD: cpu.h,v 1.5 2024/01/18 14:39:07 thorpej Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -43,7 +43,6 @@
#if defined(_KERNEL_OPT)
#include "opt_lockdebug.h"
-#include "opt_m68k_arch.h"
#endif
/*
@@ -53,11 +52,6 @@
#if defined(_KERNEL)
/*
- * Exported definitions unique to virt68k/68k cpu support.
- */
-#define M68K_MMU_MOTOROLA
-
-/*
* Arguments to hardclock and gatherstats encapsulate the previous
* machine state in an opaque clockframe. On the virt68k, we use
* what the hardware pushes on an interrupt (frame format 0).
Index: src/sys/arch/x68k/include/cpu.h
diff -u src/sys/arch/x68k/include/cpu.h:1.64 src/sys/arch/x68k/include/cpu.h:1.65
--- src/sys/arch/x68k/include/cpu.h:1.64 Tue Jan 9 04:16:27 2024
+++ src/sys/arch/x68k/include/cpu.h Thu Jan 18 14:39:07 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.64 2024/01/09 04:16:27 thorpej Exp $ */
+/* $NetBSD: cpu.h,v 1.65 2024/01/18 14:39:07 thorpej Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -42,7 +42,6 @@
#define _X68K_CPU_H_
#if defined(_KERNEL_OPT)
-#include "opt_m68k_arch.h"
#include "opt_lockdebug.h"
#endif
@@ -53,11 +52,6 @@
#if defined(_KERNEL)
/*
- * Exported definitions unique to x68k/68k cpu support.
- */
-#define M68K_MMU_MOTOROLA
-
-/*
* Get interrupt glue.
*/
#include <machine/intr.h>
