[src/trunk]: src/sys/arch/arm/arm Disable the BTB by default on the XScale ag...

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

details:   https://anonhg.NetBSD.org/src/rev/510f95f64c9e
branches:  trunk
changeset: 518042:510f95f64c9e
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Fri Nov 23 19:17:04 2001 +0000

description:
Disable the BTB by default on the XScale again; there's some early
stepping errata to deal with before we can safely do this.

diffstat:

 sys/arch/arm/arm/cpufunc.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (32 lines):

diff -r fe5113ee8c7d -r 510f95f64c9e sys/arch/arm/arm/cpufunc.c
--- a/sys/arch/arm/arm/cpufunc.c        Fri Nov 23 18:56:33 2001 +0000
+++ b/sys/arch/arm/arm/cpufunc.c        Fri Nov 23 19:17:04 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpufunc.c,v 1.16 2001/11/19 18:40:15 thorpej Exp $     */
+/*     $NetBSD: cpufunc.c,v 1.17 2001/11/23 19:17:04 thorpej Exp $     */
 
 /*
  * arm7tdmi support code Copyright (c) 2001 John Fremlin
@@ -53,10 +53,11 @@
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <machine/cpu.h>
-#include <machine/cpufunc.h>
 #include <machine/bootconfig.h>
 #include <arch/arm/arm/disassem.h>
 
+#include <arm/cpufunc.h>
+
 #ifdef CPU_ARM3
 struct cpu_functions arm3_cpufuncs = {
        /* CPU functions */
@@ -1485,8 +1486,7 @@
        cpuctrl = CPU_CONTROL_MMU_ENABLE | CPU_CONTROL_32BP_ENABLE
                 | CPU_CONTROL_32BD_ENABLE | CPU_CONTROL_SYST_ENABLE
                 | CPU_CONTROL_IC_ENABLE | CPU_CONTROL_DC_ENABLE
-                | CPU_CONTROL_WBUF_ENABLE | CPU_CONTROL_LABT_ENABLE
-                | CPU_CONTROL_BPRD_ENABLE;
+                | CPU_CONTROL_WBUF_ENABLE | CPU_CONTROL_LABT_ENABLE;
        cpuctrlmask = CPU_CONTROL_MMU_ENABLE | CPU_CONTROL_32BP_ENABLE
                 | CPU_CONTROL_32BD_ENABLE | CPU_CONTROL_SYST_ENABLE
                 | CPU_CONTROL_IC_ENABLE | CPU_CONTROL_DC_ENABLE