svn commit: r274941 - head/sys/arm/include

[Ian Lepore]

Author: ian
Date: Mon Nov 24 01:13:58 2014
New Revision: 274941
URL: https://svnweb.freebsd.org/changeset/base/274941

Log:
  The arm PJ4B cpu is armv7 architecture, not v6.
  
  If this feels like deja vu... the last time this was fixed in this file
  only ARM_MMU_V6 was fixed, this time it's ARM_ARCH_V6 (and this time I
  searched for other occurrances of pj4b in here).

Modified:
  head/sys/arm/include/cpuconf.h

Modified: head/sys/arm/include/cpuconf.h
==============================================================================
--- head/sys/arm/include/cpuconf.h	Mon Nov 24 00:59:51 2014	(r274940)
+++ head/sys/arm/include/cpuconf.h	Mon Nov 24 01:13:58 2014	(r274941)
@@ -85,14 +85,14 @@
 #endif
 
 #if !defined(ARM_ARCH_6)
-#if defined(CPU_ARM1136) || defined(CPU_ARM1176) || defined(CPU_MV_PJ4B)
+#if defined(CPU_ARM1136) || defined(CPU_ARM1176)
 #define ARM_ARCH_6	1
 #else
 #define ARM_ARCH_6	0
 #endif
 #endif
 
-#if defined(CPU_CORTEXA) || defined(CPU_KRAIT)
+#if defined(CPU_CORTEXA) || defined(CPU_KRAIT) || defined(CPU_MV_PJ4B)
 #define ARM_ARCH_7A	1
 #else
 #define ARM_ARCH_7A	0