Remove support for ARM11. This was the last unused and unmaintained

processor in our code.  Now we're left with only armv7 and XScale for
armish and zaurus.

ok jsg@

4 files changed, 5 insertions, 55 deletions

diff --git a/sys/arch/arm/include/armreg.h b/sys/arch/arm/include/armreg.h
index b2325fb38b6..27f191774e7 100644
--- a/sys/arch/arm/include/armreg.h
+++ b/sys/arch/arm/include/armreg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: armreg.h,v 1.27 2016/03/22 23:28:02 patrick Exp $	*/
+/*	$OpenBSD: armreg.h,v 1.28 2016/03/22 23:35:01 patrick Exp $	*/
 /*	$NetBSD: armreg.h,v 1.27 2003/09/06 08:43:02 rearnsha Exp $	*/
 
 /*
@@ -131,8 +131,6 @@
 
 /* Individual CPUs are probably best IDed by everything but the revision. */
 #define CPU_ID_CPU_MASK		0xfffffff0
-#define CPU_ID_ARM1136JS	0x4107b360
-#define CPU_ID_ARM1136JSR1	0x4117b360
 #define CPU_ID_PXA250		0x69052100 /* sans core revision */
 #define CPU_ID_PXA210		0x69052120
 #define CPU_ID_PXA250A		0x69052100 /* 1st version Core */
diff --git a/sys/arch/arm/include/cpuconf.h b/sys/arch/arm/include/cpuconf.h
index cb9c700f9c8..087d10b22a8 100644
--- a/sys/arch/arm/include/cpuconf.h
+++ b/sys/arch/arm/include/cpuconf.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpuconf.h,v 1.15 2016/03/22 23:28:02 patrick Exp $	*/
+/*	$OpenBSD: cpuconf.h,v 1.16 2016/03/22 23:35:01 patrick Exp $	*/
 /*	$NetBSD: cpuconf.h,v 1.7 2003/05/23 00:57:24 ichiro Exp $	*/
 
 /*
@@ -54,12 +54,6 @@
 #define	ARM_ARCH_5	0
 #endif
 
-#if defined(CPU_ARM11)
-#define ARM_ARCH_6     1
-#else 
-#define ARM_ARCH_6     0
-#endif
-
 #if defined(CPU_ARMv7)
 #define ARM_ARCH_7     1
 #else 
@@ -78,7 +72,7 @@
  *				protection is not used, TEX/AP is used instead.
  */
 
-#if (defined(CPU_ARM11) || defined(CPU_ARMv7))
+#if defined(CPU_ARMv7)
 #define	ARM_MMU_GENERIC		1
 #else
 #define	ARM_MMU_GENERIC		0
diff --git a/sys/arch/arm/include/cpufunc.h b/sys/arch/arm/include/cpufunc.h
index 494b851b46a..fd758d6c8b2 100644
--- a/sys/arch/arm/include/cpufunc.h
+++ b/sys/arch/arm/include/cpufunc.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpufunc.h,v 1.23 2016/03/22 23:28:02 patrick Exp $	*/
+/*	$OpenBSD: cpufunc.h,v 1.24 2016/03/22 23:35:01 patrick Exp $	*/
 /*	$NetBSD: cpufunc.h,v 1.29 2003/09/06 09:08:35 rearnsha Exp $	*/
 
 /*
@@ -213,45 +213,6 @@ u_int	cpufunc_dfar		(void);
 u_int	cpufunc_ifsr		(void);
 u_int	cpufunc_ifar		(void);
 
-#ifdef CPU_ARM11
-void	arm11_setttb		(u_int);
-
-void	arm11_tlb_flushID_SE	(u_int);
-void	arm11_tlb_flushI_SE	(u_int);
-
-void	arm11_context_switch	(u_int);
-
-void	arm11_setup		(void);
-void	arm11_tlb_flushID	(void);
-void	arm11_tlb_flushI	(void);
-void	arm11_tlb_flushD	(void);
-void	arm11_tlb_flushD_SE	(u_int	va);
-
-void	arm11_drain_writebuf	(void);
-void	arm11_cpu_sleep		(int	mode);
-#endif
-
-
-#if defined(CPU_ARM11)
-void	armv5_setttb			(u_int);
-
-void	armv5_icache_sync_all		(void);
-void	armv5_icache_sync_range		(vaddr_t, vsize_t);
-
-void	armv5_dcache_wbinv_all		(void);
-void	armv5_dcache_wbinv_range	(vaddr_t, vsize_t);
-void	armv5_dcache_inv_range		(vaddr_t, vsize_t);
-void	armv5_dcache_wb_range		(vaddr_t, vsize_t);
-
-void	armv5_idcache_wbinv_all		(void);
-void	armv5_idcache_wbinv_range	(vaddr_t, vsize_t);
-
-extern unsigned armv5_dcache_sets_max;
-extern unsigned armv5_dcache_sets_inc;
-extern unsigned armv5_dcache_index_max;
-extern unsigned armv5_dcache_index_inc;
-#endif
-
 #ifdef CPU_ARMv7
 void	armv7_setttb		(u_int);
 
diff --git a/sys/arch/arm/include/pmap.h b/sys/arch/arm/include/pmap.h
index 4acd2adc69e..b382dc3de8f 100644
--- a/sys/arch/arm/include/pmap.h
+++ b/sys/arch/arm/include/pmap.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.h,v 1.39 2016/03/22 23:28:02 patrick Exp $	*/
+/*	$OpenBSD: pmap.h,v 1.40 2016/03/22 23:35:01 patrick Exp $	*/
 /*	$NetBSD: pmap.h,v 1.76 2003/09/06 09:10:46 rearnsha Exp $	*/
 
 /*
@@ -371,9 +371,6 @@ void	pmap_copy_page_generic(struct vm_page *, struct vm_page *);
 void	pmap_zero_page_generic(struct vm_page *);
 
 void	pmap_pte_init_generic(void);
-#if defined(CPU_ARM11)
-void	pmap_pte_init_arm11(void);
-#endif /* CPU_ARM11 */
 #if defined(CPU_ARMv7)
 void	pmap_pte_init_armv7(void);
 #endif /* CPU_ARMv7 */