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

Get rid of cpu040 for good.

This commit is contained in:
briggs 1995-08-12 04:08:29 +00:00
parent 89a5fea138
commit 1fd03600dd
4 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/arch/mac68k/include/cpu.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: cpu.h,v 1.23 1995/07/06 13:25:30 briggs Exp $ */
/* $NetBSD: cpu.h,v 1.24 1995/08/12 04:08:29 briggs Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@ -257,8 +257,8 @@ extern unsigned long IOBase; /* Base address of I/O */
extern unsigned long NuBusBase; /* Base address of NuBus */
extern struct mac68k_machine_S mac68k_machine;
extern int mmutype, cpu040;
extern unsigned long load_addr ;
extern int mmutype ;
extern unsigned long load_addr;
#endif /* _KERNEL */
/* physical memory sections */

4
sys/arch/mac68k/mac68k/fpu.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: fpu.c,v 1.9 1995/06/21 03:20:58 briggs Exp $ */
/* $NetBSD: fpu.c,v 1.10 1995/08/12 04:10:37 briggs Exp $ */
/*
* Copyright (c) 1995 Gordon W. Ross
@ -118,7 +118,7 @@ fpu_probe()
* Presumably, if we're an 040 and did not take exception
* above, we have an FPU. Don't bother probing.
*/
if (cpu040) {
if (mmutype == MMU_68040) {
return 3;
}

10
sys/arch/mac68k/mac68k/locore.s
View File

@ -1,4 +1,4 @@
/* $NetBSD: locore.s,v 1.43 1995/08/09 03:21:59 briggs Exp $ */
/* $NetBSD: locore.s,v 1.44 1995/08/12 04:10:34 briggs Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@ -108,7 +108,7 @@ Ljmp0panic:
* Trap/interrupt vector routines
*/
.globl _cpu040, _trap, _nofault, _longjmp
.globl _trap, _nofault, _longjmp
_buserr:
tstl _nofault | device probe?
jeq Lberr | no, handle as usual
@ -857,13 +857,12 @@ start:
jbsr _vm_set_page_size | Set the vm system page size, now.
jbsr _consinit | XXX Should only be if graybar on
tstl _cpu040
cmpl #MMU_68040, _mmutype | Set in _getenvvars ONLY if 040.
beq Lstartnot040 | It's not an '040
.word 0xf4f8 | cpusha bc - push and invalidate caches
movl #CACHE4_OFF,d0 | 68040 cache disable
movc d0, cacr
movl #MMU_68040, _mmutype | 68040 MMU
movel #0x0, d0
.word 0x4e7b, 0x0004 | Disable itt0
@ -1713,6 +1712,7 @@ ENTRY(loadustp)
rts
LmotommuC:
#endif
pflusha
lea _protorp,a0 | CRP prototype
movl d0,a0@(4) | stash USTP
pmove a0@,crp | load root pointer
@ -2252,8 +2252,6 @@ _intiolimit:
.globl _load_addr
_load_addr:
.long 0 | Physical address of kernel
_cpu040:
.long 0 | Flag: Are we currently running on a 68040
lastpage:
.long 0 | LAK: to store the addr of last page in mem
#ifdef DEBUG

10
sys/arch/mac68k/mac68k/machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.61 1995/08/09 03:25:25 briggs Exp $ */
/* $NetBSD: machdep.c,v 1.62 1995/08/12 04:10:39 briggs Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@ -1813,7 +1813,12 @@ getenvvars()
* More misc stuff from booter.
*/
mac68k_machine.machineid = getenv("MACHINEID");
mac68k_machine.mach_processor = getenv("PROCESSOR");
switch (mac68k_machine.mach_processor = getenv("PROCESSOR")) {
case MACH_68040:
mmutype = MMU_68040;
break;
default:;
}
mac68k_machine.mach_memsize = getenv("MEMSIZE");
mac68k_machine.do_graybars = getenv("GRAYBARS");
locore_dodebugmarks = mac68k_machine.do_graybars;
@ -1909,7 +1914,6 @@ setmachdep()
break;
case MACH_CLASSQ:
VIA2 = 1;
cpu040 = 1;
IOBase = 0x50f00000;
Via1Base = (volatile u_char *) IOBase;
mac68k_machine.scsi96 = 1;