From d4600e67df31f46096618edaf024f63af07e7acb Mon Sep 17 00:00:00 2001 From: cognet Date: Thu, 24 Aug 2006 23:51:28 +0000 Subject: Finally bring it support for the i80219 XScale processor. Submitted by: Max M. Boyarov --- sys/arm/include/armreg.h | 2 ++ sys/arm/include/cpuconf.h | 8 +++++--- sys/arm/include/cpufunc.h | 17 ++++++++++------- 3 files changed, 17 insertions(+), 10 deletions(-) (limited to 'sys/arm/include') diff --git a/sys/arm/include/armreg.h b/sys/arm/include/armreg.h index 1d0cb42..9c0af80 100644 --- a/sys/arm/include/armreg.h +++ b/sys/arm/include/armreg.h @@ -155,6 +155,8 @@ #define CPU_ID_80321_600 0x69052430 #define CPU_ID_80321_400_B0 0x69052c20 #define CPU_ID_80321_600_B0 0x69052c30 +#define CPU_ID_80219_400 0x69052e20 /* A0 stepping/revision. */ +#define CPU_ID_80219_600 0x69052e30 /* A0 stepping/revision. */ #define CPU_ID_IXP425_533 0x690541c0 #define CPU_ID_IXP425_400 0x690541d0 #define CPU_ID_IXP425_266 0x690541f0 diff --git a/sys/arm/include/cpuconf.h b/sys/arm/include/cpuconf.h index eb74b7c..143179e 100644 --- a/sys/arm/include/cpuconf.h +++ b/sys/arm/include/cpuconf.h @@ -64,7 +64,7 @@ #define ARM_ARCH_4 0 #endif -#if (defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) || \ +#if (defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) || defined(CPU_XSCALE_80219) || \ defined(CPU_XSCALE_PXA2X0)) || defined(CPU_ARM10) #define ARM_ARCH_5 1 #else @@ -112,7 +112,8 @@ #endif #if(defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) || \ - defined(CPU_XSCALE_PXA2X0) || defined(CPU_XSCALE_IXP425)) + defined(CPU_XSCALE_PXA2X0) || defined(CPU_XSCALE_IXP425) || \ + defined(CPU_XSCALE_80219)) #define ARM_MMU_XSCALE 1 #else #define ARM_MMU_XSCALE 0 @@ -130,7 +131,8 @@ * ARM_XSCALE_PMU Performance Monitoring Unit on 80200 and 80321 */ -#if (defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321)) +#if (defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) || \ + defined(CPU_XSCALE_80219)) #define ARM_XSCALE_PMU 1 #else #define ARM_XSCALE_PMU 0 diff --git a/sys/arm/include/cpufunc.h b/sys/arm/include/cpufunc.h index 86483f0..9686aa2 100644 --- a/sys/arm/include/cpufunc.h +++ b/sys/arm/include/cpufunc.h @@ -371,10 +371,11 @@ extern unsigned arm10_dcache_index_inc; #endif #if defined(CPU_ARM9) || defined(CPU_ARM10) || defined(CPU_SA110) || \ - defined(CPU_SA1100) || defined(CPU_SA1110) || \ - defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) || \ - defined(CPU_XSCALE_PXA2X0) || defined(CPU_XSCALE_IXP425) - + defined(CPU_SA1100) || defined(CPU_SA1110) || \ + defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) || \ + defined(CPU_XSCALE_PXA2X0) || defined(CPU_XSCALE_IXP425) || \ + defined(CPU_XSCALE_80219) + void armv4_tlb_flushID (void); void armv4_tlb_flushI (void); void armv4_tlb_flushD (void); @@ -389,8 +390,9 @@ void ixp12x0_context_switch (void); void ixp12x0_setup (char *string); #endif -#if defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) || \ - defined(CPU_XSCALE_PXA2X0) || defined(CPU_XSCALE_IXP425) +#if defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) || \ + defined(CPU_XSCALE_PXA2X0) || defined(CPU_XSCALE_IXP425) || \ + defined(CPU_XSCALE_80219) void xscale_cpwait (void); void xscale_cpu_sleep (int mode); @@ -428,7 +430,8 @@ void xscale_cache_flushD_rng (vm_offset_t start, vm_size_t end); void xscale_context_switch (void); void xscale_setup (char *string); -#endif /* CPU_XSCALE_80200 || CPU_XSCALE_80321 || CPU_XSCALE_PXA2X0 || CPU_XSCALE_IXP425 */ +#endif /* CPU_XSCALE_80200 || CPU_XSCALE_80321 || CPU_XSCALE_PXA2X0 || CPU_XSCALE_IXP425 + CPU_XSCALE_80219 */ #define tlb_flush cpu_tlb_flushID #define setttb cpu_setttb -- cgit v1.1