Module Name: src
Committed By: christos
Date: Wed Nov 6 02:36:36 UTC 2013
Modified Files:
src/sys/arch/arm/arm: cpufunc.c
Log Message:
ifdef notyet code.
To generate a diff of this commit:
cvs rdiff -u -r1.127 -r1.128 src/sys/arch/arm/arm/cpufunc.c
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.c
diff -u src/sys/arch/arm/arm/cpufunc.c:1.127 src/sys/arch/arm/arm/cpufunc.c:1.128
--- src/sys/arch/arm/arm/cpufunc.c:1.127 Wed Oct 23 16:28:11 2013
+++ src/sys/arch/arm/arm/cpufunc.c Tue Nov 5 21:36:36 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: cpufunc.c,v 1.127 2013/10/23 20:28:11 skrll Exp $ */
+/* $NetBSD: cpufunc.c,v 1.128 2013/11/06 02:36:36 christos 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.127 2013/10/23 20:28:11 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpufunc.c,v 1.128 2013/11/06 02:36:36 christos Exp $");
#include "opt_compat_netbsd.h"
#include "opt_cpuoptions.h"
@@ -3192,19 +3192,19 @@ struct cpu_option sa110_options[] = {
void
sa110_setup(char *args)
{
- int cpuctrl, cpuctrlmask;
-
- cpuctrl = CPU_CONTROL_MMU_ENABLE | CPU_CONTROL_32BP_ENABLE
+ int 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;
- cpuctrlmask = CPU_CONTROL_MMU_ENABLE | CPU_CONTROL_32BP_ENABLE
+#ifdef notyet
+ int 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
| CPU_CONTROL_WBUF_ENABLE | CPU_CONTROL_ROM_ENABLE
| CPU_CONTROL_BEND_ENABLE | CPU_CONTROL_AFLT_ENABLE
| CPU_CONTROL_LABT_ENABLE | CPU_CONTROL_BPRD_ENABLE
| CPU_CONTROL_CPCLK;
+#endif
#ifndef ARM32_DISABLE_ALIGNMENT_FAULTS
cpuctrl |= CPU_CONTROL_AFLT_ENABLE;
@@ -3226,7 +3226,9 @@ sa110_setup(char *args)
/* Set the control register */
curcpu()->ci_ctrl = cpuctrl;
-/* cpu_control(cpuctrlmask, cpuctrl);*/
+#ifdef notyet
+ cpu_control(cpuctrlmask, cpuctrl);
+#endif
cpu_control(0xffffffff, cpuctrl);
/*
