Work around the previous xscale/sa1xx muck, should now work for cats and xscale

systems.

2 files changed, 12 insertions, 36 deletions

diff --git a/sys/arch/arm/arm/pmap.c b/sys/arch/arm/arm/pmap.c
index 002716502d4..f6fb03cd9bf 100644
--- a/sys/arch/arm/arm/pmap.c
+++ b/sys/arch/arm/arm/pmap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.c,v 1.3 2004/12/25 23:02:23 miod Exp $	*/
+/*	$OpenBSD: pmap.c,v 1.4 2004/12/30 23:40:08 drahn Exp $	*/
 /*	$NetBSD: pmap.c,v 1.147 2004/01/18 13:03:50 scw Exp $	*/
 
 /*
@@ -3323,11 +3323,7 @@ pmap_zero_page_xscale(struct vm_page *pg)
 	cpu_tlb_flushD_SE(cdstp);
 	cpu_cpwait();
 	bzero_page(cdstp);
-#if 0
 	xscale_cache_clean_minidata();
-#else
-	printf("xscale_cache_clean_minidata call\n");
-#endif
 }
 #endif /* ARM_MMU_XSCALE == 1 */
 
@@ -3476,11 +3472,7 @@ pmap_copy_page_xscale(struct vm_page *src_pg, struct vm_page *dst_pg)
 	cpu_cpwait();
 	bcopy_page(csrcp, cdstp);
 	simple_unlock(&src_pg->mdpage.pvh_slock); /* cache is safe again */
-#if 0
 	xscale_cache_clean_minidata();
-#else
-	printf("xscale_cache_clean_minidata call\n");
-#endif
 }
 #endif /* ARM_MMU_XSCALE == 1 */
 
@@ -4882,20 +4874,16 @@ pmap_pte_init_xscale(void)
  *	caller to allocate the right amount of physically and
  *	virtually contiguous space.
  */
-vaddr_t xscale_minidata_clean_addr;
-vsize_t xscale_minidata_clean_size; /* already initialized */
+vaddr_t xscale_minidata_clean_addr = 1;
+vsize_t xscale_minidata_clean_size = 0x00000800; /* XXX already initialized */
 
 void
 xscale_setup_minidata(vaddr_t l1pt, vaddr_t va, paddr_t pa)
 {
-	extern vaddr_t xscale_minidata_clean_addr;
-	extern vsize_t xscale_minidata_clean_size; /* already initialized */
 	pd_entry_t *pde = (pd_entry_t *) l1pt;
 	pt_entry_t *pte;
 	vsize_t size;
 	uint32_t auxctl;
-	panic("xscale_setup_minidata: xscale_minidata_clean_size, "
-	    "xscale_minidata_clean_addr");
 
 	xscale_minidata_clean_addr = va;
 
diff --git a/sys/arch/arm/include/cpuconf.h b/sys/arch/arm/include/cpuconf.h
index 8ccd375e18e..d988ef93bf4 100644
--- a/sys/arch/arm/include/cpuconf.h
+++ b/sys/arch/arm/include/cpuconf.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpuconf.h,v 1.1 2004/02/01 05:09:49 drahn Exp $	*/
+/*	$OpenBSD: cpuconf.h,v 1.2 2004/12/30 23:40:07 drahn Exp $	*/
 /*	$NetBSD: cpuconf.h,v 1.7 2003/05/23 00:57:24 ichiro Exp $	*/
 
 /*
@@ -39,10 +39,6 @@
 #ifndef _ARM_CPUCONF_H_
 #define	_ARM_CPUCONF_H_
 
-#if defined(_KERNEL_OPT)
-#include "opt_cputypes.h"
-#endif /* _KERNEL_OPT */
-
 /*
  * IF YOU CHANGE THIS FILE, MAKE SURE TO UPDATE THE DEFINITION OF
  * "PMAP_NEEDS_PTE_SYNC" IN <arm/arm/pmap.h> FOR THE CPU TYPE
@@ -73,22 +69,19 @@
 /*
  * Step 2: Determine which ARM architecture versions are configured.
  */
-#if !defined(_KERNEL_OPT) ||						\
-    (defined(CPU_ARM2) || defined(CPU_ARM250) || defined(CPU_ARM3))
+#if (defined(CPU_ARM2) || defined(CPU_ARM250) || defined(CPU_ARM3))
 #define	ARM_ARCH_2	1
 #else
 #define	ARM_ARCH_2	0
 #endif
 
-#if !defined(_KERNEL_OPT) ||						\
-    (defined(CPU_ARM6) || defined(CPU_ARM7))
+#if (defined(CPU_ARM6) || defined(CPU_ARM7))
 #define	ARM_ARCH_3	1
 #else
 #define	ARM_ARCH_3	0
 #endif
 
-#if !defined(_KERNEL_OPT) ||						\
-    (defined(CPU_ARM7TDMI) || defined(CPU_ARM8) || defined(CPU_ARM9) ||	\
+#if (defined(CPU_ARM7TDMI) || defined(CPU_ARM8) || defined(CPU_ARM9) ||	\
      defined(CPU_ARM10) || defined(CPU_SA110) || defined(CPU_SA1100) || \
      defined(CPU_SA1110) || defined(CPU_IXP12X0) || defined(CPU_XSCALE_IXP425))
 #define	ARM_ARCH_4	1
@@ -96,8 +89,7 @@
 #define	ARM_ARCH_4	0
 #endif
 
-#if !defined(_KERNEL_OPT) ||						\
-    (defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) ||		\
+#if (defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) ||		\
      defined(CPU_XSCALE_PXA2X0))
 #define	ARM_ARCH_5	1
 #else
@@ -124,31 +116,27 @@
  *				MMU, but also has several extensions which
  *				require different PTE layout to use.
  */
-#if !defined(_KERNEL_OPT) ||						\
-    (defined(CPU_ARM2) || defined(CPU_ARM250) || defined(CPU_ARM3))
+#if (defined(CPU_ARM2) || defined(CPU_ARM250) || defined(CPU_ARM3))
 #define	ARM_MMU_MEMC		1
 #else
 #define	ARM_MMU_MEMC		0
 #endif
 
-#if !defined(_KERNEL_OPT) ||						\
-    (defined(CPU_ARM6) || defined(CPU_ARM7) || defined(CPU_ARM7TDMI) ||	\
+#if (defined(CPU_ARM6) || defined(CPU_ARM7) || defined(CPU_ARM7TDMI) ||	\
      defined(CPU_ARM8) || defined(CPU_ARM9) || defined(CPU_ARM10))
 #define	ARM_MMU_GENERIC		1
 #else
 #define	ARM_MMU_GENERIC		0
 #endif
 
-#if !defined(_KERNEL_OPT) ||						\
-    (defined(CPU_SA110) || defined(CPU_SA1100) || defined(CPU_SA1110) ||\
+#if (defined(CPU_SA110) || defined(CPU_SA1100) || defined(CPU_SA1110) ||\
      defined(CPU_IXP12X0))
 #define	ARM_MMU_SA1		1
 #else
 #define	ARM_MMU_SA1		0
 #endif
 
-#if !defined(_KERNEL_OPT) ||						\
-    (defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) ||		\
+#if (defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321) ||		\
      defined(CPU_XSCALE_PXA2X0) || defined(CPU_XSCALE_IXP425))
 #define	ARM_MMU_XSCALE		1
 #else