Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix few more places where 040+060 rlevant stuff was only compiled for 68040,

Browse Source 
preventing 68060-only kernels to work. (68060 only kernel is tested now by
using it to commit this patch).
This commit is contained in:
is 1996-05-25 21:54:22 +00:00
parent be8ad0bbb0
commit eafd041aca
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/arch/amiga/amiga/amiga_init.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: amiga_init.c,v 1.42 1996/05/24 19:59:41 is Exp $ */ /* $NetBSD: amiga_init.c,v 1.43 1996/05/25 21:54:24 is Exp $ */
/* /*
* Copyright (c) 1994 Michael L. Hitch * Copyright (c) 1994 Michael L. Hitch
@ -66,7 +66,7 @@ extern u_int lowram;
extern u_int Sysptmap, Sysptsize, Sysseg, Umap, proc0paddr; extern u_int Sysptmap, Sysptsize, Sysseg, Umap, proc0paddr;
extern u_int Sysseg_pa; extern u_int Sysseg_pa;
extern u_int virtual_avail; extern u_int virtual_avail;
#ifdef M68040 #if defined(M68040) || defined(M68060)
extern int protostfree; extern int protostfree;
#endif #endif
@ -174,6 +174,7 @@ alloc_z2mem(amount)
* written by Bryan Ford and Niklas Hallqvist. * written by Bryan Ford and Niklas Hallqvist.
* *
* Very crude 68040 support by Michael L. Hitch. * Very crude 68040 support by Michael L. Hitch.
*
*/ */
int kernel_copyback = 1; int kernel_copyback = 1;
@ -334,7 +335,7 @@ start_c(id, fphystart, fphysize, cphysize, esym_addr, flags, inh_sync)
pend = vend + fphystart; pend = vend + fphystart;
avail -= vstart; avail -= vstart;
#ifdef M68040 #if defined(M68040) || defined(M68060)
if (RELOC(mmutype, int) == MMU_68040) if (RELOC(mmutype, int) == MMU_68040)
kstsize = MAXKL2SIZE / (NPTEPG/SG4_LEV2SIZE); kstsize = MAXKL2SIZE / (NPTEPG/SG4_LEV2SIZE);
else else
@ -795,7 +796,7 @@ start_c(id, fphystart, fphysize, cphysize, esym_addr, flags, inh_sync)
/* /*
* prepare to enable the MMU * prepare to enable the MMU
*/ */
#ifdef M68040 #if defined(M68040) || defined(M68060)
if (RELOC(mmutype, int) == MMU_68040) { if (RELOC(mmutype, int) == MMU_68040) {
/* /*
* movel Sysseg_pa,a0; * movel Sysseg_pa,a0;

4
sys/arch/amiga/amiga/machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.74 1996/05/25 17:08:51 is Exp $ */ /* $NetBSD: machdep.c,v 1.75 1996/05/25 21:54:22 is Exp $ */
/* /*
* Copyright (c) 1988 University of Utah. * Copyright (c) 1988 University of Utah.
@ -1205,6 +1205,7 @@ initcpu()
#else #else
extern u_int8_t illinst; extern u_int8_t illinst;
#endif #endif
extern u_int8_t fpfault;
#endif #endif
#ifdef DRACO #ifdef DRACO
@ -1235,6 +1236,7 @@ initcpu()
#else #else
vectab[61] = &illinst; vectab[61] = &illinst;
#endif #endif
vectab[48] = &fpfault;
} }
#endif #endif

6
sys/arch/amiga/amiga/sys_machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: sys_machdep.c,v 1.14 1996/04/21 21:07:13 veego Exp $ */ /* $NetBSD: sys_machdep.c,v 1.15 1996/05/25 21:54:28 is Exp $ */
/* /*
* Copyright (c) 1982, 1986 Regents of the University of California. * Copyright (c) 1982, 1986 Regents of the University of California.
@ -126,7 +126,7 @@ cachectl(req, addr, len)
int len; int len;
{ {
int error = 0; int error = 0;
#ifdef M68040 #if defined(M68040) || defined(M68060)
if (mmutype == MMU_68040) { if (mmutype == MMU_68040) {
register int inc = 0; register int inc = 0;
int pa = 0, doall = 0; int pa = 0, doall = 0;
@ -236,7 +236,7 @@ dma_cachectl(addr, len)
caddr_t addr; caddr_t addr;
int len; int len;
{ {
#ifdef M68040 #if defined(M68040) || defined(M68060)
if (mmutype == MMU_68040) { if (mmutype == MMU_68040) {
register int inc = 0; register int inc = 0;
int pa = 0; int pa = 0;