Module Name: src
Committed By: snj
Date: Tue Dec 6 06:44:14 UTC 2016
Modified Files:
src/sys/arch/luna68k/luna68k [netbsd-7]: locore.s
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #1281):
sys/arch/luna68k/luna68k/locore.s: revisions 1.60-1.62
Allow NetBSD/luna68k kernel work with 8kB/page (PGSHIFT==13) settings.
Tested on both LUNA (68030) and LUNA-II (68040).
--
Make kernels build without options M68030.
--
Fix spelling in comments.
To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.59.4.1 src/sys/arch/luna68k/luna68k/locore.s
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/luna68k/luna68k/locore.s
diff -u src/sys/arch/luna68k/luna68k/locore.s:1.59 src/sys/arch/luna68k/luna68k/locore.s:1.59.4.1
--- src/sys/arch/luna68k/luna68k/locore.s:1.59 Sat Mar 22 16:52:07 2014
+++ src/sys/arch/luna68k/luna68k/locore.s Tue Dec 6 06:44:14 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.59 2014/03/22 16:52:07 tsutsui Exp $ */
+/* $NetBSD: locore.s,v 1.59.4.1 2016/12/06 06:44:14 snj Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -187,12 +187,14 @@ Lstart1:
jra Lstart2
1:
#endif
+#if defined(M68030)
cmpl #CPU_68030,%a0@ | 68030?
jne 1f | no, skip
movl #_C_LABEL(busaddrerr2030),%a2@(8)
movl #_C_LABEL(busaddrerr2030),%a2@(12)
jra Lstart2
1:
+#endif
/* Config botch; no hope. */
PANIC("Config botch in locore")
@@ -287,7 +289,7 @@ Lmotommu1:
RELOC(protott1,%a0) | tt1 range 8000.0000-ffff.ffff
.long 0xf0100c00 | pmove %a0@,mmutt1
pflusha
- RELOC(prototc,%a0) | %tc: SRP,CRP,4KB page,A=10bit,B=10bit
+ RELOC(prototc,%a0) | %tc: SRP,CRP,4KB or 8KB page
pmove %a0@,%tc
/*
* Should be running mapped from this point on
@@ -909,17 +911,25 @@ GLOBAL(protocrp)
.long 0x80000002,0 | prototype CPU root pointer
GLOBAL(prototc)
+#if PGSHIFT == 13
+ .long 0x82d08b00 | %tc (SRP,CRP,8KB page, TIA/TIB=8/11bits)
+#else
.long 0x82c0aa00 | %tc (SRP,CRP,4KB page, TIA/TIB=10/10bits)
+#endif
GLOBAL(protott0) | tt0 0x4000.0000-0x7fff.ffff
.long 0x403f8543 |
GLOBAL(protott1) | tt1 0x8000.0000-0xffff.ffff
.long 0x807f8543 |
GLOBAL(proto040tc)
+#if PGSHIFT == 13
+ .long 0xc000 | %tc (8KB page)
+#else
.long 0x8000 | %tc (4KB page)
+#endif
GLOBAL(proto040tt0) | tt0 0x4000.0000-0x7fff.ffff
- .long 0x403fa040 | kernel only, cache inhebit, serialized
+ .long 0x403fa040 | kernel only, cache inhibit, serialized
GLOBAL(proto040tt1) | tt1 0x8000.0000-0xffff.ffff
- .long 0x807fa040 | kernel only, cache inhebit, serialized
+ .long 0x807fa040 | kernel only, cache inhibit, serialized
nullrp:
.long 0x7fff0001 | do-nothing MMU root pointer
