[src/trunk]: src/sys/arch/arm/include Default ARM11 to ARM_MMU_V6N

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

details:   https://anonhg.NetBSD.org/src/rev/9dc65a063c7d
branches:  trunk
changeset: 793733:9dc65a063c7d
user:      matt <matt%NetBSD.org@localhost>
date:      Tue Feb 25 08:54:57 2014 +0000

description:
Default ARM11 to ARM_MMU_V6N

diffstat:

 sys/arch/arm/include/cpuconf.h |  24 ++++++++++++++++--------
 1 files changed, 16 insertions(+), 8 deletions(-)

diffs (51 lines):

diff -r 4dd29de40735 -r 9dc65a063c7d sys/arch/arm/include/cpuconf.h
--- a/sys/arch/arm/include/cpuconf.h    Tue Feb 25 08:39:39 2014 +0000
+++ b/sys/arch/arm/include/cpuconf.h    Tue Feb 25 08:54:57 2014 +0000
@@ -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)