[src/trunk]: src/sys/arch/arm Require arm3_cache_flush for ARM2/ARM250.

[kiyohara <kiyohara%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/6a69258b639e
branches:  trunk
changeset: 771949:6a69258b639e
user:      kiyohara <kiyohara%NetBSD.org@localhost>
date:      Sun Dec 11 03:30:23 2011 +0000

description:
Require arm3_cache_flush for ARM2/ARM250.

diffstat:

 sys/arch/arm/arm/cpufunc_asm_arm3.S |  6 ++++--
 sys/arch/arm/conf/files.arm         |  4 ++--
 sys/arch/arm/include/cpufunc.h      |  5 ++++-
 3 files changed, 10 insertions(+), 5 deletions(-)

diffs (71 lines):

diff -r c9fc1be0acdf -r 6a69258b639e sys/arch/arm/arm/cpufunc_asm_arm3.S
--- a/sys/arch/arm/arm/cpufunc_asm_arm3.S       Sun Dec 11 03:19:20 2011 +0000
+++ b/sys/arch/arm/arm/cpufunc_asm_arm3.S       Sun Dec 11 03:30:23 2011 +0000
@@ -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 @@
        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
diff -r c9fc1be0acdf -r 6a69258b639e sys/arch/arm/conf/files.arm
--- a/sys/arch/arm/conf/files.arm       Sun Dec 11 03:19:20 2011 +0000
+++ b/sys/arch/arm/conf/files.arm       Sun Dec 11 03:30:23 2011 +0000
@@ -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/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
diff -r c9fc1be0acdf -r 6a69258b639e sys/arch/arm/include/cpufunc.h
--- a/sys/arch/arm/include/cpufunc.h    Sun Dec 11 03:19:20 2011 +0000
+++ b/sys/arch/arm/include/cpufunc.h    Sun Dec 11 03:30:23 2011 +0000
@@ -213,6 +213,10 @@
 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 @@
 
 #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)