Module Name: src Committed By: snj Date: Sun Mar 15 22:52:18 UTC 2015
Modified Files: src/sys/arch/evbarm/conf [netbsd-7]: RPI RPI2 Log Message: 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 To generate a diff of this commit: cvs rdiff -u -r1.46.2.6 -r1.46.2.7 src/sys/arch/evbarm/conf/RPI cvs rdiff -u -r1.2.2.2 -r1.2.2.3 src/sys/arch/evbarm/conf/RPI2 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/evbarm/conf/RPI diff -u src/sys/arch/evbarm/conf/RPI:1.46.2.6 src/sys/arch/evbarm/conf/RPI:1.46.2.7 --- src/sys/arch/evbarm/conf/RPI:1.46.2.6 Wed Mar 11 20:22:56 2015 +++ src/sys/arch/evbarm/conf/RPI Sun Mar 15 22:52:18 2015 @@ -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 RTC_OFFSET=0 # hardware clock i 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" Index: src/sys/arch/evbarm/conf/RPI2 diff -u src/sys/arch/evbarm/conf/RPI2:1.2.2.2 src/sys/arch/evbarm/conf/RPI2:1.2.2.3 --- src/sys/arch/evbarm/conf/RPI2:1.2.2.2 Wed Mar 11 20:22:56 2015 +++ src/sys/arch/evbarm/conf/RPI2 Sun Mar 15 22:52:18 2015 @@ -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 @@ include "arch/evbarm/conf/RPI" no options CPU_ARM1176 no options TPIDRPRW_IS_CURLWP +no options ARM11_COMPAT_MMU no options __HAVE_MM_MD_CACHE_ALIASING no makeoptions CPUFLAGS