svn commit: r215106 - stable/8/sys/arm/include

Kevin Lo kevlo at FreeBSD.org
Thu Nov 11 02:37:50 UTC 2010


Author: kevlo
Date: Thu Nov 11 02:37:50 2010
New Revision: 215106
URL: http://svn.freebsd.org/changeset/base/215106

Log:
  MFC r214972,r215031:
  - Intel IXP425 SoC is based on the ARMv5TE architecture
  - Minor cosmetic changes

Modified:
  stable/8/sys/arm/include/cpuconf.h

Modified: stable/8/sys/arm/include/cpuconf.h
==============================================================================
--- stable/8/sys/arm/include/cpuconf.h	Thu Nov 11 00:29:19 2010	(r215105)
+++ stable/8/sys/arm/include/cpuconf.h	Thu Nov 11 02:37:50 2010	(r215106)
@@ -68,7 +68,7 @@
  */
 #if (defined(CPU_ARM7TDMI) || defined(CPU_ARM8) || defined(CPU_ARM9) ||	\
      defined(CPU_SA110) || defined(CPU_SA1100) || defined(CPU_SA1110) || \
-    defined(CPU_IXP12X0) || defined(CPU_XSCALE_IXP425))
+    defined(CPU_IXP12X0))
 #define	ARM_ARCH_4	1
 #else
 #define	ARM_ARCH_4	0
@@ -77,7 +77,7 @@
 #if (defined(CPU_ARM9E) || defined(CPU_ARM10) ||			\
      defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) ||		\
      defined(CPU_XSCALE_80219) || defined(CPU_XSCALE_81342) ||		\
-     defined(CPU_XSCALE_PXA2X0))
+     defined(CPU_XSCALE_PXA2X0) || defined(CPU_XSCALE_IXP425))
 #define	ARM_ARCH_5	1
 #else
 #define	ARM_ARCH_5	0
@@ -138,9 +138,9 @@
 #define	ARM_MMU_SA1		0
 #endif
 
-#if(defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) ||		\
-    defined(CPU_XSCALE_PXA2X0) || defined(CPU_XSCALE_IXP425) ||		\
-    defined(CPU_XSCALE_80219)) || defined(CPU_XSCALE_81342)
+#if (defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) ||		\
+     defined(CPU_XSCALE_PXA2X0) || defined(CPU_XSCALE_IXP425) ||	\
+     defined(CPU_XSCALE_80219) || defined(CPU_XSCALE_81342))
 #define	ARM_MMU_XSCALE		1
 #else
 #define	ARM_MMU_XSCALE		0
@@ -159,7 +159,7 @@
  */
 
 #if (defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) || \
-     defined(CPU_XSCALE_80219)) || defined(CPU_XSCALE_81342)
+     defined(CPU_XSCALE_80219) || defined(CPU_XSCALE_81342))
 #define ARM_XSCALE_PMU	1
 #else
 #define ARM_XSCALE_PMU	0


More information about the svn-src-stable-8 mailing list