Module Name: src
Committed By: matt
Date: Tue Feb 25 08:54:57 UTC 2014
Modified Files:
src/sys/arch/arm/include: cpuconf.h
Log Message:
Default ARM11 to ARM_MMU_V6N
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/arm/include/cpuconf.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/include/cpuconf.h
diff -u src/sys/arch/arm/include/cpuconf.h:1.21 src/sys/arch/arm/include/cpuconf.h:1.22
--- src/sys/arch/arm/include/cpuconf.h:1.21 Sun May 19 15:51:10 2013
+++ src/sys/arch/arm/include/cpuconf.h Tue Feb 25 08:54:57 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: cpuconf.h,v 1.21 2013/05/19 15:51:10 rkujawa Exp $ */
+/* $NetBSD: cpuconf.h,v 1.22 2014/02/25 08:54:57 matt Exp $ */
/*
* Copyright (c) 2002 Wasabi Systems, Inc.
@@ -213,19 +213,14 @@
#endif
#if !defined(_KERNEL_OPT) || \
- defined(CPU_ARM11MPCORE) && defined(ARM11MPCORE_COMPAT_MMU) || \
- defined(CPU_ARM1136) || \
- defined(CPU_ARM1176) || \
- defined(CPU_ARM11) && \
- !defined(CPU_CORTEX) && \
- !defined(CPU_ARM11MPCORE) && !defined(CPU_PJ4B)
+ defined(CPU_ARM11) && defined(ARM11_COMPAT_MMU)
#define ARM_MMU_V6C 1
#else
#define ARM_MMU_V6C 0
#endif
#if !defined(_KERNEL_OPT) || \
- defined(CPU_ARM11MPCORE) && !defined(ARM11MPCORE_COMPAT_MMU)
+ defined(CPU_ARM11) && !defined(ARM11_COMPAT_MMU)
#define ARM_MMU_V6N 1
#else
#define ARM_MMU_V6N 0
@@ -241,6 +236,19 @@
#define ARM_MMU_V7 0
#endif
+/*
+ * Can we use the ASID support in armv6+ MMUs?
+ */
+#if !defined(_LOCORE) && 0
+#define ARM_MMU_EXTENDED ((ARM_MMU_MEMC + ARM_MMU_GENERIC \
+ + ARM_MMU_SA1 + ARM_MMU_XSCALE \
+ + ARM_MMU_V6C) == 0 \
+ && (ARM_MMU_V6N + ARM_MMU_V7) > 0)
+#if ARM_MMU_EXTENDED == 0
+#undef ARM_MMU_EXTENDED
+#endif
+#endif
+
#define ARM_NMMUS (ARM_MMU_MEMC + ARM_MMU_GENERIC + \
ARM_MMU_SA1 + ARM_MMU_XSCALE + \
ARM_MMU_V6N + ARM_MMU_V6C + ARM_MMU_V7)
