[src/netbsd-7]: src/sys/arch/evbarm/conf Pull up following revision(s) (reque...

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

details:   https://anonhg.NetBSD.org/src/rev/ab7a60b6b32f
branches:  netbsd-7
changeset: 799086:ab7a60b6b32f
user:      snj <snj%NetBSD.org@localhost>
date:      Sun Mar 15 22:52:18 2015 +0000

description:
Pull up following revision(s) (requested by jmcneill in ticket #593):
        sys/arch/evbarm/conf/RPI: revision 1.61
        sys/arch/evbarm/conf/RPI2: revision 1.3
re-add ARM11_COMPAT_MMU, lost in the rpi2 shuffle
--
add no options ARM11_COMPAT_MMU

diffstat:

 sys/arch/evbarm/conf/RPI  |  3 ++-
 sys/arch/evbarm/conf/RPI2 |  3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diffs (36 lines):

diff -r 96c7ac26dbb4 -r ab7a60b6b32f sys/arch/evbarm/conf/RPI
--- a/sys/arch/evbarm/conf/RPI  Sun Mar 15 22:47:55 2015 +0000
+++ b/sys/arch/evbarm/conf/RPI  Sun Mar 15 22:52:18 2015 +0000
@@ -1,5 +1,5 @@
 #
-#      $NetBSD: RPI,v 1.46.2.6 2015/03/11 20:22:56 snj Exp $
+#      $NetBSD: RPI,v 1.46.2.7 2015/03/15 22:52:18 snj Exp $
 #
 #      RPi -- Raspberry Pi
 #
@@ -20,6 +20,7 @@
 options        CPU_ARM1176
 options        PMAPCOUNTERS
 options        TPIDRPRW_IS_CURLWP
+options        ARM11_COMPAT_MMU
 options        __HAVE_MM_MD_CACHE_ALIASING
 makeoptions    CPUFLAGS="-march=armv6z -mtune=arm1176jzf-s -mfpu=vfp"
 
diff -r 96c7ac26dbb4 -r ab7a60b6b32f sys/arch/evbarm/conf/RPI2
--- a/sys/arch/evbarm/conf/RPI2 Sun Mar 15 22:47:55 2015 +0000
+++ b/sys/arch/evbarm/conf/RPI2 Sun Mar 15 22:52:18 2015 +0000
@@ -1,5 +1,5 @@
 #
-#      $NetBSD: RPI2,v 1.2.2.2 2015/03/11 20:22:56 snj Exp $
+#      $NetBSD: RPI2,v 1.2.2.3 2015/03/15 22:52:18 snj Exp $
 #
 #      RPi2 -- Raspberry Pi 2
 #
@@ -8,6 +8,7 @@
 
 no options     CPU_ARM1176
 no options     TPIDRPRW_IS_CURLWP
+no options     ARM11_COMPAT_MMU
 no options     __HAVE_MM_MD_CACHE_ALIASING
 no makeoptions CPUFLAGS