[src/trunk]: src/sys/arch/arm/arm arm11 ARM_MMU_EXTENDED support (setting CPU...

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

details:   https://anonhg.NetBSD.org/src/rev/b42bc896950f
branches:  trunk
changeset: 328314:b42bc896950f
user:      matt <matt%NetBSD.org@localhost>
date:      Sun Mar 30 23:20:14 2014 +0000

description:
arm11 ARM_MMU_EXTENDED support (setting CPU_CONTROL_XP_ENABLE)

diffstat:

 sys/arch/arm/arm/cpufunc.c |  20 +++++++++++++-------
 1 files changed, 13 insertions(+), 7 deletions(-)

diffs (58 lines):

diff -r 5a542d056cf3 -r b42bc896950f sys/arch/arm/arm/cpufunc.c
--- a/sys/arch/arm/arm/cpufunc.c        Sun Mar 30 23:14:15 2014 +0000
+++ b/sys/arch/arm/arm/cpufunc.c        Sun Mar 30 23:20:14 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpufunc.c,v 1.143 2014/03/30 08:36:21 skrll Exp $      */
+/*     $NetBSD: cpufunc.c,v 1.144 2014/03/30 23:20:14 matt Exp $       */
 
 /*
  * arm7tdmi support code Copyright (c) 2001 John Fremlin
@@ -49,7 +49,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpufunc.c,v 1.143 2014/03/30 08:36:21 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpufunc.c,v 1.144 2014/03/30 23:20:14 matt Exp $");
 
 #include "opt_compat_netbsd.h"
 #include "opt_cpuoptions.h"
@@ -2962,10 +2962,12 @@
 {
 
        int cpuctrl = CPU_CONTROL_MMU_ENABLE | CPU_CONTROL_SYST_ENABLE
+#ifdef ARM_MMU_EXTENDED
+           | CPU_CONTROL_XP_ENABLE
+#endif
            | CPU_CONTROL_IC_ENABLE | CPU_CONTROL_DC_ENABLE
            /* | CPU_CONTROL_BPRD_ENABLE */;
-       int cpuctrlmask = CPU_CONTROL_MMU_ENABLE | CPU_CONTROL_SYST_ENABLE
-           | CPU_CONTROL_IC_ENABLE | CPU_CONTROL_DC_ENABLE
+       int cpuctrlmask = cpuctrl
            | CPU_CONTROL_ROM_ENABLE | CPU_CONTROL_BPRD_ENABLE
            | CPU_CONTROL_BEND_ENABLE | CPU_CONTROL_AFLT_ENABLE
            | CPU_CONTROL_ROUNDROBIN | CPU_CONTROL_CPCLK;
@@ -3011,10 +3013,11 @@
 
        int cpuctrl = CPU_CONTROL_IC_ENABLE
            | CPU_CONTROL_DC_ENABLE
+#ifdef ARM_MMU_EXTENDED
+           | CPU_CONTROL_XP_ENABLE
+#endif
            | CPU_CONTROL_BPRD_ENABLE ;
-       int cpuctrlmask = CPU_CONTROL_IC_ENABLE
-           | CPU_CONTROL_DC_ENABLE
-           | CPU_CONTROL_BPRD_ENABLE
+       int cpuctrlmask = cpuctrl
            | CPU_CONTROL_AFLT_ENABLE
            | CPU_CONTROL_VECRELOC;
 
@@ -3153,6 +3156,9 @@
                CPU_CONTROL_LABT_ENABLE |
                CPU_CONTROL_SYST_ENABLE |
                CPU_CONTROL_UNAL_ENABLE |
+#ifdef ARM_MMU_EXTENDED
+               CPU_CONTROL_XP_ENABLE   |
+#endif
                CPU_CONTROL_IC_ENABLE;
 
        /*