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

[Andrew Turner]

Author: andrew
Date: Wed Aug 15 13:48:59 2018
New Revision: 337845
URL: https://svnweb.freebsd.org/changeset/base/337845

Log:
  Remove checks for now unsupported CPU_* values in arm headers.
  
  Sponsored by:	DARPA, AFRL

Modified:
  head/sys/arm/include/intr.h
  head/sys/arm/include/pmap-v4.h

Modified: head/sys/arm/include/intr.h
==============================================================================
--- head/sys/arm/include/intr.h	Wed Aug 15 13:42:22 2018	(r337844)
+++ head/sys/arm/include/intr.h	Wed Aug 15 13:48:59 2018	(r337845)
@@ -68,14 +68,9 @@ int intr_pic_ipi_setup(u_int, const char *, intr_ipi_h
 #else /* INTRNG */
 
 /* XXX move to std.* files? */
-#ifdef CPU_XSCALE_81342
-#define NIRQ		128
-#elif defined(CPU_XSCALE_PXA2X0)
-#include <arm/xscale/pxa/pxareg.h>
-#define	NIRQ		IRQ_GPIO_MAX
-#elif defined(SOC_MV_DISCOVERY)
+#if defined(SOC_MV_DISCOVERY)
 #define NIRQ		96
-#elif defined(CPU_ARM9) || defined(SOC_MV_KIRKWOOD)
+#elif defined(SOC_MV_KIRKWOOD)
 #define NIRQ		64
 #elif defined(CPU_CORTEXA)
 #define NIRQ		1020

Modified: head/sys/arm/include/pmap-v4.h
==============================================================================
--- head/sys/arm/include/pmap-v4.h	Wed Aug 15 13:42:22 2018	(r337844)
+++ head/sys/arm/include/pmap-v4.h	Wed Aug 15 13:48:59 2018	(r337845)
@@ -57,19 +57,13 @@
  * some theoretical support for multiple MMU types in a single kernel, there are
  * no actual working configurations that use that feature.
  */
-#if (defined(CPU_ARM9) || defined(CPU_ARM9E) ||	defined(CPU_FA526))
+#if defined(CPU_ARM9E)
 #define	ARM_MMU_GENERIC		1
 #else
 #define	ARM_MMU_GENERIC		0
 #endif
 
-#if (defined(CPU_XSCALE_PXA2X0) || defined(CPU_XSCALE_81342))
-#define	ARM_MMU_XSCALE		1
-#else
-#define	ARM_MMU_XSCALE		0
-#endif
-
-#define	ARM_NMMUS		(ARM_MMU_GENERIC + ARM_MMU_XSCALE)
+#define	ARM_NMMUS		(ARM_MMU_GENERIC)
 #if ARM_NMMUS == 0 && !defined(KLD_MODULE) && defined(_KERNEL)
 #error ARM_NMMUS is 0
 #endif
@@ -338,19 +332,6 @@ extern int pmap_needs_pte_sync;
 #define	L1_S_PROTO		L1_S_PROTO_generic
 #define	L1_C_PROTO		L1_C_PROTO_generic
 #define	L2_S_PROTO		L2_S_PROTO_generic
-
-#elif ARM_MMU_XSCALE == 1
-#define	L2_S_PROT_U		L2_S_PROT_U_xscale
-#define	L2_S_PROT_W		L2_S_PROT_W_xscale
-#define	L2_S_PROT_MASK		L2_S_PROT_MASK_xscale
-
-#define	L1_S_CACHE_MASK		L1_S_CACHE_MASK_xscale
-#define	L2_L_CACHE_MASK		L2_L_CACHE_MASK_xscale
-#define	L2_S_CACHE_MASK		L2_S_CACHE_MASK_xscale
-
-#define	L1_S_PROTO		L1_S_PROTO_xscale
-#define	L1_C_PROTO		L1_C_PROTO_xscale
-#define	L2_S_PROTO		L2_S_PROTO_xscale
 
 #endif /* ARM_NMMUS > 1 */