diff options
Diffstat (limited to 'sys/arch/arm/include')
| -rw-r--r-- | sys/arch/arm/include/armreg.h | 8 | ||||
| -rw-r--r-- | sys/arch/arm/include/cpuconf.h | 18 | ||||
| -rw-r--r-- | sys/arch/arm/include/cpufunc.h | 9 |
3 files changed, 8 insertions, 27 deletions
diff --git a/sys/arch/arm/include/armreg.h b/sys/arch/arm/include/armreg.h index 63a746a836b..e0ab251ed2f 100644 --- a/sys/arch/arm/include/armreg.h +++ b/sys/arch/arm/include/armreg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: armreg.h,v 1.34 2016/08/14 10:36:47 kettenis Exp $ */ +/* $OpenBSD: armreg.h,v 1.35 2016/08/14 11:30:54 jsg Exp $ */ /* $NetBSD: armreg.h,v 1.27 2003/09/06 08:43:02 rearnsha Exp $ */ /* @@ -139,13 +139,7 @@ #define CPU_ID_PXA210B 0x69052920 /* 3rd version Core */ #define CPU_ID_PXA250C 0x69052d00 /* 4th version Core */ #define CPU_ID_PXA210C 0x69052d20 /* 4th version Core */ -#define CPU_ID_80219_400 0x69052e20 -#define CPU_ID_80219_600 0x69052e30 #define CPU_ID_PXA27X 0x69054110 -#define CPU_ID_80321_400 0x69052420 -#define CPU_ID_80321_600 0x69052430 -#define CPU_ID_80321_400_B0 0x69052c20 -#define CPU_ID_80321_600_B0 0x69052c30 #define CPU_ID_CORTEX_MASK 0xff0ffff0 #define CPU_ID_CORTEX_A5 0x410fc050 #define CPU_ID_CORTEX_A5_MASK 0xff0ffff0 diff --git a/sys/arch/arm/include/cpuconf.h b/sys/arch/arm/include/cpuconf.h index 087d10b22a8..5af430eaaae 100644 --- a/sys/arch/arm/include/cpuconf.h +++ b/sys/arch/arm/include/cpuconf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cpuconf.h,v 1.16 2016/03/22 23:35:01 patrick Exp $ */ +/* $OpenBSD: cpuconf.h,v 1.17 2016/08/14 11:30:54 jsg Exp $ */ /* $NetBSD: cpuconf.h,v 1.7 2003/05/23 00:57:24 ichiro Exp $ */ /* @@ -48,7 +48,7 @@ /* * Determine which ARM architecture versions are configured. */ -#if (defined(CPU_XSCALE_80321) || defined(CPU_XSCALE_PXA2X0)) +#if defined(CPU_XSCALE_PXA2X0) #define ARM_ARCH_5 1 #else #define ARM_ARCH_5 0 @@ -78,7 +78,7 @@ #define ARM_MMU_GENERIC 0 #endif -#if (defined(CPU_XSCALE_80321) || defined(CPU_XSCALE_PXA2X0)) +#if defined(CPU_XSCALE_PXA2X0) #define ARM_MMU_XSCALE 1 #else #define ARM_MMU_XSCALE 0 @@ -93,16 +93,4 @@ #define ARM_NMMUS (ARM_MMU_GENERIC + \ ARM_MMU_XSCALE + ARM_MMU_V7) -/* - * Define features that may be present on a subset of CPUs - * - * ARM_XSCALE_PMU Performance Monitoring Unit on 80321 - */ - -#if defined(CPU_XSCALE_80321) -#define ARM_XSCALE_PMU 1 -#else -#define ARM_XSCALE_PMU 0 -#endif - #endif /* _ARM_CPUCONF_H_ */ diff --git a/sys/arch/arm/include/cpufunc.h b/sys/arch/arm/include/cpufunc.h index eb66ac73ca2..5e38d49e270 100644 --- a/sys/arch/arm/include/cpufunc.h +++ b/sys/arch/arm/include/cpufunc.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cpufunc.h,v 1.25 2016/04/03 13:55:23 jsg Exp $ */ +/* $OpenBSD: cpufunc.h,v 1.26 2016/08/14 11:30:54 jsg Exp $ */ /* $NetBSD: cpufunc.h,v 1.29 2003/09/06 09:08:35 rearnsha Exp $ */ /* @@ -253,7 +253,7 @@ extern unsigned armv7_dcache_index_inc; #endif -#if defined(CPU_XSCALE_80321) || defined(CPU_XSCALE_PXA2X0) +#if defined(CPU_XSCALE_PXA2X0) void armv4_tlb_flushID (void); void armv4_tlb_flushI (void); void armv4_tlb_flushD (void); @@ -262,8 +262,7 @@ void armv4_tlb_flushD_SE (u_int va); void armv4_drain_writebuf (void); #endif -#if defined(CPU_XSCALE_80321) || \ - defined(CPU_XSCALE_PXA2X0) || (ARM_MMU_XSCALE == 1) +#if defined(CPU_XSCALE_PXA2X0) || (ARM_MMU_XSCALE == 1) void xscale_cpwait (void); void xscale_cpu_sleep (int mode); @@ -301,7 +300,7 @@ void xscale_cache_flushD_rng (vaddr_t start, vsize_t end); void xscale_context_switch (u_int); void xscale_setup (void); -#endif /* CPU_XSCALE_80321 || CPU_XSCALE_PXA2X0 */ +#endif /* CPU_XSCALE_PXA2X0 */ #define tlb_flush cpu_tlb_flushID #define setttb cpu_setttb |