Skip to content

Commit 3f758b7

Browse files
committed
Config glue for __HAVE_NEW_PMAP_68K
1 parent d671021 commit 3f758b7

2 files changed

Lines changed: 8 additions & 4 deletions

File tree

sys/arch/mac68k/conf/files.mac68k

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $NetBSD: files.mac68k,v 1.135 2025/04/03 01:54:46 nat Exp $
1+
# $NetBSD: files.mac68k,v 1.136 2025/12/02 03:03:20 thorpej Exp $
22

33
# mac68k-specific configuration info
44

@@ -171,7 +171,7 @@ file arch/mac68k/mac68k/machdep.c
171171
file arch/mac68k/mac68k/macrom.c
172172
file arch/mac68k/mac68k/macromasm.s
173173
file arch/mac68k/mac68k/mainbus.c
174-
file arch/mac68k/mac68k/pmap_bootstrap.c compile-with "${NOPROF_C}"
174+
file arch/mac68k/mac68k/pmap_bootstrap.c !__have_new_pmap_68k compile-with "${NOPROF_C}"
175175
file arch/mac68k/mac68k/pram.c
176176
file arch/mac68k/mac68k/pramasm.s
177177
file arch/mac68k/mac68k/psc.c
@@ -184,7 +184,8 @@ file arch/m68k/m68k/fpu.c compile-with "${M68K_KERN_FPU}"
184184
file arch/m68k/m68k/kgdb_machdep.c kgdb
185185
file arch/m68k/m68k/m68k_trap.c
186186
file arch/m68k/m68k/mmu_subr.s
187-
file arch/m68k/m68k/pmap_motorola.c
187+
file arch/m68k/m68k/pmap_motorola.c !__have_new_pmap_68k
188+
file arch/m68k/m68k/pmap_68k.c __have_new_pmap_68k
188189
file arch/m68k/m68k/procfs_machdep.c procfs
189190
file arch/m68k/m68k/sys_machdep.c
190191
file arch/m68k/m68k/vm_machdep.c

sys/arch/mac68k/conf/std.mac68k

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
1-
# $NetBSD: std.mac68k,v 1.31 2024/01/18 14:39:06 thorpej Exp $
1+
# $NetBSD: std.mac68k,v 1.32 2025/12/02 03:03:20 thorpej Exp $
22
#
33
# "options" common to all mac68k kernel configs
44

55
machine mac68k m68k
66
include "conf/std" # MI standard options
77
include "arch/m68k/conf/std.m68k" # m68k standard options
88

9+
# Experimental shiny object
10+
#options __HAVE_NEW_PMAP_68K
11+
912
# All 68k Macs that NetBSD runs on have a Motorola MMU. For 68030 and 68040,
1013
# this is inferred from the CPU. But if the kernel only includes support for
1114
# 68020, we have to be explicit about it.

0 commit comments

Comments
 (0)