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

Require arm3_cache_flush for ARM2/ARM250.

This commit is contained in:
kiyohara 2011-12-11 03:30:23 +00:00
parent eb7d3a72c4
commit 7b1d08098e
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/arch/arm/arm/cpufunc_asm_arm3.S
View File

@ -1,4 +1,4 @@
/* $NetBSD: cpufunc_asm_arm3.S,v 1.1 2001/11/10 23:14:09 thorpej Exp $ */
/* $NetBSD: cpufunc_asm_arm3.S,v 1.2 2011/12/11 03:30:23 kiyohara Exp $ */
/*
* Copyright (c) 1997,1998 Mark Brinicombe.
@ -38,6 +38,7 @@
#include <machine/cpu.h>
#include <machine/asm.h>
#ifdef CPU_ARM3
/*
* The ARM3 has its own control register in a different place.
*/
@ -50,11 +51,12 @@ ENTRY(arm3_control)
mcrne p15, 0, r2, c2, c0, 0 /* Write new control register */
mov r0, r3 /* Return old value */
mov pc, lr
#endif /* CPU_ARM3 */
/*
* Cache functions.
*/
ENTRY(arm3_cache_flush)
ENTRY(arm3_cache_flush) /* Also ARM2 and ARM250 */
mcr p15, 0, r0, c1, c0, 0
mov pc, lr

4
sys/arch/arm/conf/files.arm
View File

@ -1,4 +1,4 @@
# $NetBSD: files.arm,v 1.102 2011/06/12 03:35:39 rmind Exp $
# $NetBSD: files.arm,v 1.103 2011/12/11 03:30:23 kiyohara Exp $
# temporary define to allow easy moving to ../arch/arm/arm32
defflag ARM32
@ -105,7 +105,7 @@ file arch/arm/arm/core_machdep.c
file arch/arm/arm/cpu_in_cksum.S (inet | inet6) & cpu_in_cksum
file arch/arm/arm/cpufunc.c
file arch/arm/arm/cpufunc_asm.S
file arch/arm/arm/cpufunc_asm_arm3.S cpu_arm3
file arch/arm/arm/cpufunc_asm_arm3.S cpu_arm2 | cpu_arm250 | cpu_arm3
file arch/arm/arm/cpufunc_asm_arm67.S cpu_arm6 | cpu_arm7
file arch/arm/arm/cpufunc_asm_arm7tdmi.S cpu_arm7tdmi
file arch/arm/arm/cpufunc_asm_arm8.S cpu_arm8

5
sys/arch/arm/include/cpufunc.h
View File

@ -213,6 +213,10 @@ void cpufunc_domains (u_int);
u_int cpufunc_faultstatus (void);
u_int cpufunc_faultaddress (void);
#if defined(CPU_ARM2) || defined(CPU_ARM250) || defined(CPU_ARM3)
void arm3_cache_flush (void);
#endif /* CPU_ARM2 || CPU_ARM250 || CPU_ARM3 */
#ifdef CPU_ARM2
u_int arm2_id (void);
#endif /* CPU_ARM2 */
@ -223,7 +227,6 @@ u_int arm250_id (void);
#ifdef CPU_ARM3
u_int arm3_control (u_int, u_int);
void arm3_cache_flush (void);
#endif /* CPU_ARM3 */
#if defined(CPU_ARM6) || defined(CPU_ARM7)