diff options
| author | Andrew Turner <andrew@FreeBSD.org> | 2015-03-30 09:29:45 +0000 |
|---|---|---|
| committer | Andrew Turner <andrew@FreeBSD.org> | 2015-03-30 09:29:45 +0000 |
| commit | a3db11e053606ac7fe5d6873d44d59d1d0d3a6d7 (patch) | |
| tree | dcb26b774a88091ff7404b1801e99683c02a60e7 /sys/arm/include/cpuconf.h | |
| parent | dcdebabdead399b7e37d9ff8e5efb18a3de4283c (diff) | |
Notes
Diffstat (limited to 'sys/arm/include/cpuconf.h')
| -rw-r--r-- | sys/arm/include/cpuconf.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/sys/arm/include/cpuconf.h b/sys/arm/include/cpuconf.h index 3a84c4cf5b0b..ecee28088255 100644 --- a/sys/arm/include/cpuconf.h +++ b/sys/arm/include/cpuconf.h @@ -53,7 +53,6 @@ #define CPU_NTYPES (defined(CPU_ARM9) + \ defined(CPU_ARM9E) + \ defined(CPU_ARM1176) + \ - defined(CPU_XSCALE_80200) + \ defined(CPU_XSCALE_80321) + \ defined(CPU_XSCALE_PXA2X0) + \ defined(CPU_FA526) + \ @@ -71,8 +70,8 @@ #define ARM_ARCH_4 0 #endif -#if (defined(CPU_ARM9E) || defined(CPU_ARM10) || \ - defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) || \ +#if (defined(CPU_ARM9E) || \ + defined(CPU_XSCALE_80321) || \ defined(CPU_XSCALE_80219) || defined(CPU_XSCALE_81342) || \ defined(CPU_XSCALE_PXA2X0) || defined(CPU_XSCALE_IXP425)) #define ARM_ARCH_5 1 @@ -146,8 +145,7 @@ * MMU, but also has several extensions which * require different PTE layout to use. */ -#if (defined(CPU_ARM9) || defined(CPU_ARM9E) || \ - defined(CPU_ARM10) || defined(CPU_FA526)) +#if (defined(CPU_ARM9) || defined(CPU_ARM9E) || defined(CPU_FA526)) #define ARM_MMU_GENERIC 1 #else #define ARM_MMU_GENERIC 0 @@ -165,7 +163,7 @@ #define ARM_MMU_V7 0 #endif -#if (defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) || \ +#if (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 @@ -185,7 +183,7 @@ * ARM_XSCALE_PMU Performance Monitoring Unit on 80200 and 80321 */ -#if (defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) || \ +#if (defined(CPU_XSCALE_80321) || \ defined(CPU_XSCALE_80219) || defined(CPU_XSCALE_81342)) #define ARM_XSCALE_PMU 1 #else |