Module Name: src
Committed By: kiyohara
Date: Sun Dec 11 03:30:24 UTC 2011
Modified Files:
src/sys/arch/arm/arm: cpufunc_asm_arm3.S
src/sys/arch/arm/conf: files.arm
src/sys/arch/arm/include: cpufunc.h
Log Message:
Require arm3_cache_flush for ARM2/ARM250.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/arm/cpufunc_asm_arm3.S
cvs rdiff -u -r1.102 -r1.103 src/sys/arch/arm/conf/files.arm
cvs rdiff -u -r1.53 -r1.54 src/sys/arch/arm/include/cpufunc.h
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/arm/arm/cpufunc_asm_arm3.S
diff -u src/sys/arch/arm/arm/cpufunc_asm_arm3.S:1.1 src/sys/arch/arm/arm/cpufunc_asm_arm3.S:1.2
--- src/sys/arch/arm/arm/cpufunc_asm_arm3.S:1.1 Sat Nov 10 23:14:09 2001
+++ src/sys/arch/arm/arm/cpufunc_asm_arm3.S Sun Dec 11 03:30:23 2011
@@ -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
Index: src/sys/arch/arm/conf/files.arm
diff -u src/sys/arch/arm/conf/files.arm:1.102 src/sys/arch/arm/conf/files.arm:1.103
--- src/sys/arch/arm/conf/files.arm:1.102 Sun Jun 12 03:35:39 2011
+++ src/sys/arch/arm/conf/files.arm Sun Dec 11 03:30:23 2011
@@ -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
Index: src/sys/arch/arm/include/cpufunc.h
diff -u src/sys/arch/arm/include/cpufunc.h:1.53 src/sys/arch/arm/include/cpufunc.h:1.54
--- src/sys/arch/arm/include/cpufunc.h:1.53 Thu Mar 10 07:47:15 2011
+++ src/sys/arch/arm/include/cpufunc.h Sun Dec 11 03:30:23 2011
@@ -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)
