Centralize ARM CPU configuration information by adding a new header

file, <arm/cpuconf.h>, which pulls in "opt_cputypes.h" and then defines the following: * CPU_NTYPES -- now many CPU types are configured into the kernel. What you really want to know is "== 1" or "> 1". * Defines ARM_ARCH_2, ARM_ARCH_3, ARM_ARCH_4, ARM_ARCH_5, depending on which ARM architecture versions are configured (based on CPU_* options). Also defines ARM_NARCH to determins how many architecture versions are configured. * Defines ARM_MMU_MEMC, ARM_MMU_GENERIC, ARM_MMU_XSCALE depending on which classes of ARM MMUs are configured into the kernel, and ARM_NMMUS to determine how many MMU classes are configured. Remove the needless inclusion of "opt_cputypes.h" in several places. Convert remaining users to <arm/cpuconf.h>.
2002-04-12 18:50:29 +00:00 · 2002-04-12 18:50:29 +00:00 · 32a0860797
commit 32a0860797
parent 5ee554064d
26 changed files with 197 additions and 105 deletions
--- a/sys/arch/acorn26/acorn26/cpu.c
+++ b/sys/arch/acorn26/acorn26/cpu.c
@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.2 2002/03/24 23:37:42 bjh21 Exp $ */
+/* $NetBSD: cpu.c,v 1.3 2002/04/12 18:50:30 thorpej Exp $ */

 /*-
 * Copyright (c) 2000, 2001 Ben Harris
@ -32,7 +32,7 @@

 #include <sys/param.h>

-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.2 2002/03/24 23:37:42 bjh21 Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.3 2002/04/12 18:50:30 thorpej Exp $");

 #include <sys/device.h>
 #include <sys/proc.h>
@ -41,14 +41,13 @@ __KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.2 2002/03/24 23:37:42 bjh21 Exp $");
 #include <sys/user.h>
 #include <uvm/uvm_extern.h>
 #include <arm/armreg.h>
+#include <arm/cpuconf.h>
 #include <arm/undefined.h>
 #include <machine/machdep.h>
 #include <machine/pcb.h>

 #include <arch/acorn26/acorn26/cpuvar.h>

-#include "opt_cputypes.h"
-
 static int cpu_match(struct device *, struct cfdata *, void *);
 static void cpu_attach(struct device *, struct device *, void *);
 static int cpu_search(struct device *, struct cfdata *, void *);
--- a/sys/arch/acorn26/acorn26/except.c
+++ b/sys/arch/acorn26/acorn26/except.c
@ -1,4 +1,4 @@
-/* $NetBSD: except.c,v 1.2 2002/03/24 23:37:42 bjh21 Exp $ */
+/* $NetBSD: except.c,v 1.3 2002/04/12 18:50:30 thorpej Exp $ */
 /*-
 * Copyright (c) 1998, 1999, 2000 Ben Harris
 * All rights reserved.
@ -31,9 +31,8 @@

 #include <sys/param.h>

-__KERNEL_RCSID(0, "$NetBSD: except.c,v 1.2 2002/03/24 23:37:42 bjh21 Exp $");
+__KERNEL_RCSID(0, "$NetBSD: except.c,v 1.3 2002/04/12 18:50:30 thorpej Exp $");

-#include "opt_cputypes.h"
 #include "opt_ddb.h"
 #include "opt_ktrace.h"

@ -46,6 +45,7 @@ __KERNEL_RCSID(0, "$NetBSD: except.c,v 1.2 2002/03/24 23:37:42 bjh21 Exp $");
 #include <uvm/uvm_extern.h>

 #include <arm/armreg.h>
+#include <arm/cpuconf.h>
 #include <machine/intr.h>
 #include <machine/machdep.h>
 #include <machine/pcb.h>
--- a/sys/arch/acorn26/acorn26/locore.S
+++ b/sys/arch/acorn26/acorn26/locore.S
@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.2 2002/03/24 23:37:42 bjh21 Exp $ */
+/* $NetBSD: locore.S,v 1.3 2002/04/12 18:50:30 thorpej Exp $ */
 /*
 * Copyright (c) 1998, 1999, 2000 Ben Harris
 * Copyright (C) 1994-1997 Mark Brinicombe
@ -44,7 +44,8 @@
 #include <arm/trap.h>
 #include "assym.h"

-#include "opt_cputypes.h"
+#include <arm/cpuconf.h>
+
 #include "opt_ddb.h"

 #include "fiq.h"
@ -456,4 +457,4 @@ _C_LABEL(intrcnt):
 	.global	_C_LABEL(eintrcnt)
 _C_LABEL(eintrcnt):

-RCSID("$NetBSD: locore.S,v 1.2 2002/03/24 23:37:42 bjh21 Exp $")
+RCSID("$NetBSD: locore.S,v 1.3 2002/04/12 18:50:30 thorpej Exp $")
--- a/sys/arch/acorn26/acorn26/pmap.c
+++ b/sys/arch/acorn26/acorn26/pmap.c
@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.2 2002/03/24 23:37:42 bjh21 Exp $ */
+/* $NetBSD: pmap.c,v 1.3 2002/04/12 18:50:30 thorpej Exp $ */
 /*-
 * Copyright (c) 1997, 1998, 2000 Ben Harris
 * All rights reserved.
@ -96,14 +96,13 @@
 * referenced/modified emulation.
 */

-#include "opt_cputypes.h"
 #include "opt_ddb.h"
 #include "opt_uvmhist.h"
 #include "arcvideo.h"

 #include <sys/param.h>

-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.2 2002/03/24 23:37:42 bjh21 Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.3 2002/04/12 18:50:30 thorpej Exp $");

 #include <sys/kernel.h> /* for cold */
 #include <sys/malloc.h>
@ -113,6 +112,8 @@ __KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.2 2002/03/24 23:37:42 bjh21 Exp $");
 #include <uvm/uvm_extern.h>
 #include <uvm/uvm_stat.h>

+#include <arm/cpuconf.h>
+
 #include <machine/intr.h>
 #include <machine/machdep.h>
 #include <machine/memcreg.h>
--- a/sys/arch/acorn32/acorn32/rpc_machdep.c
+++ b/sys/arch/acorn32/acorn32/rpc_machdep.c
@ -1,4 +1,4 @@
-/*	$NetBSD: rpc_machdep.c,v 1.34 2002/04/10 22:30:44 thorpej Exp $	*/
+/*	$NetBSD: rpc_machdep.c,v 1.35 2002/04/12 18:50:30 thorpej Exp $	*/

 /*
 * Copyright (c) 2000-2001 Reinoud Zandijk.
@ -47,8 +47,6 @@
 * Updated for new bootloader 22/10/00
 */

-
-#include "opt_cputypes.h"
 #include "opt_ddb.h"
 #include "opt_pmap_debug.h"
 #include "vidcvideo.h"
@ -57,7 +55,7 @@

 #include <sys/param.h>

-__KERNEL_RCSID(0, "$NetBSD: rpc_machdep.c,v 1.34 2002/04/10 22:30:44 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rpc_machdep.c,v 1.35 2002/04/12 18:50:30 thorpej Exp $");

 #include <sys/systm.h>
 #include <sys/kernel.h>
@ -80,6 +78,7 @@ __KERNEL_RCSID(0, "$NetBSD: rpc_machdep.c,v 1.34 2002/04/10 22:30:44 thorpej Exp
 #include <machine/cpu.h>
 #include <machine/io.h>
 #include <machine/intr.h>
+#include <arm/cpuconf.h>
 #include <arm/arm32/katelib.h>
 #include <arm/arm32/machdep.h>
 #include <machine/vconsole.h>
--- a/sys/arch/arm/arm/cpufunc.c
+++ b/sys/arch/arm/arm/cpufunc.c
@ -1,4 +1,4 @@
-/*	$NetBSD: cpufunc.c,v 1.40 2002/04/09 21:00:42 thorpej Exp $	*/
+/*	$NetBSD: cpufunc.c,v 1.41 2002/04/12 18:50:31 thorpej Exp $	*/

 /*
 * arm7tdmi support code Copyright (c) 2001 John Fremlin
@ -46,7 +46,6 @@
 */

 #include "opt_compat_netbsd.h"
-#include "opt_cputypes.h"
 #include "opt_cpuoptions.h"

 #include <sys/types.h>
@ -58,6 +57,7 @@

 #include <uvm/uvm.h>

+#include <arm/cpuconf.h>
 #include <arm/cpufunc.h>

 #ifdef CPU_XSCALE_80200
--- a/sys/arch/arm/arm/fiq_subr.S
+++ b/sys/arch/arm/arm/fiq_subr.S
@ -1,4 +1,4 @@
-/*	$NetBSD: fiq_subr.S,v 1.2 2002/01/01 16:24:33 skrll Exp $	*/
+/*	$NetBSD: fiq_subr.S,v 1.3 2002/04/12 18:50:31 thorpej Exp $	*/

 /*
 * Copyright (c) 2001 Wasabi Systems, Inc.
@ -36,10 +36,10 @@
 */

 #include "assym.h"
-#include "opt_cputypes.h"

 #include <arm/armreg.h>
 #include <arm/asm.h>
+#include <arm/cpuconf.h>

 /*
 * MODE_CHANGE_NOP should be inserted between a mode change and a
--- a/sys/arch/arm/arm/undefined.c
+++ b/sys/arch/arm/arm/undefined.c
@ -1,4 +1,4 @@
-/*	$NetBSD: undefined.c,v 1.13 2002/03/24 15:49:39 bjh21 Exp $	*/
+/*	$NetBSD: undefined.c,v 1.14 2002/04/12 18:50:31 thorpej Exp $	*/

 /*
 * Copyright (c) 2001 Ben Harris.
@ -46,12 +46,11 @@

 #define FAST_FPE

-#include "opt_cputypes.h"
 #include "opt_ddb.h"

 #include <sys/param.h>

-__KERNEL_RCSID(0, "$NetBSD: undefined.c,v 1.13 2002/03/24 15:49:39 bjh21 Exp $");
+__KERNEL_RCSID(0, "$NetBSD: undefined.c,v 1.14 2002/04/12 18:50:31 thorpej Exp $");

 #include <sys/malloc.h>
 #include <sys/queue.h>
--- a/sys/arch/arm/arm32/cpu.c
+++ b/sys/arch/arm/arm32/cpu.c
@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.c,v 1.32 2002/03/27 01:34:48 thorpej Exp $	*/
+/*	$NetBSD: cpu.c,v 1.33 2002/04/12 18:50:31 thorpej Exp $	*/

 /*
 * Copyright (c) 1995 Mark Brinicombe.
@ -42,11 +42,10 @@
 */

 #include "opt_armfpe.h"
-#include "opt_cputypes.h"

 #include <sys/param.h>

-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.32 2002/03/27 01:34:48 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.33 2002/04/12 18:50:31 thorpej Exp $");

 #include <sys/systm.h>
 #include <sys/malloc.h>
@ -55,6 +54,8 @@ __KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.32 2002/03/27 01:34:48 thorpej Exp $");
 #include <uvm/uvm_extern.h>
 #include <machine/conf.h>
 #include <machine/cpu.h>
+
+#include <arm/cpuconf.h>
 #include <arm/undefined.h>

 #ifdef ARMFPE
--- a/sys/arch/arm/arm32/fault.c
+++ b/sys/arch/arm/arm32/fault.c
@ -1,4 +1,4 @@
-/*	$NetBSD: fault.c,v 1.17 2002/04/04 12:39:55 skrll Exp $	*/
+/*	$NetBSD: fault.c,v 1.18 2002/04/12 18:50:31 thorpej Exp $	*/

 /*
 * Copyright (c) 1994-1997 Mark Brinicombe.
@ -43,7 +43,6 @@
 * Created      : 28/11/94
 */

-#include "opt_cputypes.h"
 #include "opt_ddb.h"
 #include "opt_pmap_debug.h"

@ -56,6 +55,8 @@

 #include <uvm/uvm_extern.h>

+#include <arm/cpuconf.h>
+
 #include <machine/frame.h>
 #include <arm/arm32/katelib.h>
 #include <machine/cpu.h>
--- a/sys/arch/arm/conf/files.arm
+++ b/sys/arch/arm/conf/files.arm
@ -1,9 +1,9 @@
-#	$NetBSD: files.arm,v 1.56 2002/03/26 19:29:45 thorpej Exp $
+#	$NetBSD: files.arm,v 1.57 2002/04/12 18:50:31 thorpej Exp $

 # temporary define to allow easy moving to ../arch/arm/arm32
 defflag				ARM32

-# CPU types
+# CPU types.  Make sure to update <arm/cpuconf.h> if you change this list.
 defflag	opt_cputypes.h		CPU_ARM2 CPU_ARM250 CPU_ARM3
 defflag	opt_cputypes.h		CPU_ARM6 CPU_ARM7 CPU_ARM7TDMI CPU_ARM8
 				CPU_ARM9 CPU_SA110 CPU_SA1100 CPU_SA1110
--- a/sys/arch/arm/footbridge/footbridge.c
+++ b/sys/arch/arm/footbridge/footbridge.c
@ -1,4 +1,4 @@
-/*	$NetBSD: footbridge.c,v 1.4 2002/01/05 22:41:47 chris Exp $	*/
+/*	$NetBSD: footbridge.c,v 1.5 2002/04/12 18:50:31 thorpej Exp $	*/

 /*
 * Copyright (c) 1997,1998 Mark Brinicombe.
@ -34,8 +34,6 @@
 * SUCH DAMAGE.
 */

-#include "opt_cputypes.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
@ -48,6 +46,7 @@
 #include <machine/bus.h>
 #include <machine/intr.h>

+#include <arm/cpuconf.h>
 #include <arm/cpufunc.h>

 #include <arm/footbridge/footbridgevar.h>
--- a/sys/arch/arm/include/arm32/pmap.h
+++ b/sys/arch/arm/include/arm32/pmap.h
@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.h,v 1.51 2002/04/10 00:45:43 thorpej Exp $	*/
+/*	$NetBSD: pmap.h,v 1.52 2002/04/12 18:50:32 thorpej Exp $	*/

 /*
 * Copyright (c 2002 Wasabi Systems, Inc.
@ -70,6 +70,7 @@

 #ifdef _KERNEL

+#include <arm/cpuconf.h>
 #include <arm/cpufunc.h>
 #include <arm/arm32/pte.h>
 #include <uvm/uvm_object.h>
@ -256,21 +257,7 @@ extern vaddr_t	pmap_curmaxkvaddr;

 /************************* ARM MMU configuration *****************************/

-/*
- * We define several classes of ARM MMU, here:
- *
- *	ARM_MMU_GENERIC		Generic ARM MMU, compatible with ARM6.
- *
- *	ARM_MMU_XSCALE		XScale MMU.  Compatible with generic ARM
- *				MMU, but also has several extensions which
- *				require different PTE layout to use.
- */
-
-#if defined(_LKM) || defined(CPU_ARM6) || defined(CPU_ARM7) || \
-    defined(CPU_ARM7TDMI) || defined(CPU_ARM8) || defined(CPU_ARM9) || \
-    defined(CPU_SA110) || defined(CPU_SA1100) || defined(CPU_SA1110)
-#define	ARM_MMU_GENERIC		1
-
+#if ARM_MMU_GENERIC == 1
 void	pmap_copy_page_generic(paddr_t, paddr_t);
 void	pmap_zero_page_generic(paddr_t);

@ -278,13 +265,9 @@ void	pmap_pte_init_generic(void);
 #if defined(CPU_ARM9)
 void	pmap_pte_init_arm9(void);
 #endif /* CPU_ARM9 */
-#else
-#define	ARM_MMU_GENERIC		0
-#endif
-
-#if defined(_LKM) || defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321)
-#define	ARM_MMU_XSCALE		1
+#endif /* ARM_MMU_GENERIC == 1 */

+#if ARM_MMU_XSCALE == 1
 void	pmap_copy_page_xscale(paddr_t, paddr_t);
 void	pmap_zero_page_xscale(paddr_t);

@ -294,14 +277,7 @@ void	pmap_pte_init_i80200(void);
 #endif /* CPU_XSCALE_80200 */

 void	xscale_setup_minidata(vaddr_t, vaddr_t, paddr_t);
-#else
-#define	ARM_MMU_XSCALE		0
-#endif
-
-#define	ARM_NMMUS		(ARM_MMU_GENERIC + ARM_MMU_XSCALE)
-#if ARM_NMMUS == 0
-#error ARM_NMMUS is 0
-#endif
+#endif /* ARM_MMU_XSCALE == 1 */

 extern pt_entry_t		pte_l1_s_cache_mode;
 extern pt_entry_t		pte_l1_s_cache_mask;
--- a/sys/arch/arm/include/cpu.h
+++ b/sys/arch/arm/include/cpu.h
@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.h,v 1.25 2002/04/03 23:33:30 thorpej Exp $	*/
+/*	$NetBSD: cpu.h,v 1.26 2002/04/12 18:50:29 thorpej Exp $	*/

 /*
 * Copyright (c) 1994-1996 Mark Brinicombe.
@ -74,10 +74,10 @@
 */

 #ifndef _LKM
-#include "opt_cputypes.h"
 #include "opt_lockdebug.h"
 #endif /* !_LKM */

+#include <arm/cpuconf.h>

 #include <machine/intr.h>
 #ifndef _LOCORE
--- a/sys/arch/arm/include/cpuconf.h
+++ b/sys/arch/arm/include/cpuconf.h
@ -0,0 +1,140 @@
+/*	$NetBSD: cpuconf.h,v 1.1 2002/04/12 18:50:29 thorpej Exp $	*/
+
+/*
+ * Copyright (c 2002 Wasabi Systems, Inc.
+ * All rights reserved.
+ *
+ * Written by Jason R. Thorpe for Wasabi Systems, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed for the NetBSD Project by
+ *	Wasabi Systems, Inc.
+ * 4. The name of Wasabi Systems, Inc. may not be used to endorse
+ *    or promote products derived from this software without specific prior
+ *    written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY WASABI SYSTEMS, INC. ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL WASABI SYSTEMS, INC
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _ARM_CPUCONF_H_
+#define	_ARM_CPUCONF_H_
+
+#if defined(_KERNEL_OPT)
+#include "opt_cputypes.h"
+#endif /* _KERNEL_OPT */
+
+/*
+ * Step 1: Count the number of CPU types configured into the kernel.
+ */
+#if defined(_KERNEL_OPT)
+#define	CPU_NTYPES	(defined(CPU_ARM2) + defined(CPU_ARM250) +	\
+			 defined(CPU_ARM3) +				\
+			 defined(CPU_ARM6) + defined(CPU_ARM7) +	\
+			 defined(CPU_ARM7TDMI) +			\
+			 defined(CPU_ARM8) + defined(CPU_ARM9) +	\
+			 defined(CPU_SA110) + defined(CPU_SA1100) +	\
+			 defined(CPU_SA1110) +				\
+			 defined(CPU_XSCALE_80200) +			\
+			 defined(CPU_XSCALE_80321))
+#else
+#define	CPU_NTYPES	2
+#endif /* _KERNEL_OPT */
+
+/*
+ * Step 2: Determine which ARM architecture versions are configured.
+ */
+#if !defined(_KERNEL_OPT) ||						\
+    (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))
+#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) ||	\
+     defined(CPU_SA110) || defined(CPU_SA1100) || defined(CPU_SA1110))
+#define	ARM_ARCH_4	1
+#else
+#define	ARM_ARCH_4	0
+#endif
+
+#if !defined(_KERNEL_OPT) ||						\
+    (defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321))
+#define	ARM_ARCH_5	1
+#else
+#define	ARM_ARCH_5	0
+#endif
+
+#define	ARM_NARCH	(ARM_ARCH_2 + ARM_ARCH_3 + ARM_ARCH_4 + ARM_ARCH_5)
+#if ARM_NARCH == 0
+#error ARM_NARCH is 0
+#endif
+
+/*
+ * Step 3: Define which MMU classes are configured:
+ *
+ *	ARM_MMU_MEMC		Prehistoric, external memory controller
+ *				and MMU for ARMv2 CPUs.
+ *
+ *	ARM_MMU_GENERIC		Generic ARM MMU, compatible with ARM6.
+ *
+ *	ARM_MMU_XSCALE		XScale MMU.  Compatible with generic ARM
+ *				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))
+#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) ||	\
+     defined(CPU_ARM8) || defined(CPU_ARM9) || defined(CPU_SA110) ||	\
+     defined(CPU_SA1100) || defined(CPU_SA1110))
+#define	ARM_MMU_GENERIC		1
+#else
+#define	ARM_MMU_GENERIC		0
+#endif
+
+#if !defined(_KERNEL_OPT) ||						\
+    (defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321))
+#define	ARM_MMU_XSCALE		1
+#else
+#define	ARM_MMU_XSCALE		0
+#endif
+
+#define	ARM_NMMUS		(ARM_MMU_MEMC + ARM_MMU_GENERIC +	\
+				 ARM_MMU_XSCALE)
+#if ARM_NMMUS == 0
+#error ARM_NMMUS is 0
+#endif
+
+#endif /* _ARM_CPUCONF_H_ */
--- a/sys/arch/arm/include/cpufunc.h
+++ b/sys/arch/arm/include/cpufunc.h
@ -1,4 +1,4 @@
-/*	$NetBSD: cpufunc.h,v 1.20 2002/04/09 23:44:02 thorpej Exp $	*/
+/*	$NetBSD: cpufunc.h,v 1.21 2002/04/12 18:50:29 thorpej Exp $	*/

 /*
 * Copyright (c) 1997 Mark Brinicombe.
@ -42,12 +42,10 @@
 #ifndef _ARM32_CPUFUNC_H_
 #define _ARM32_CPUFUNC_H_

-#include <sys/types.h>
-
 #ifdef _KERNEL
-#ifndef _LKM
-#include "opt_cputypes.h"
-#endif
+
+#include <sys/types.h>
+#include <arm/cpuconf.h>

 struct cpu_functions {

--- a/sys/arch/arm/sa11x0/sa11x0_irq.S
+++ b/sys/arch/arm/sa11x0/sa11x0_irq.S
@ -1,4 +1,4 @@
-/*	$NetBSD: sa11x0_irq.S,v 1.1 2001/07/08 23:37:53 rjs Exp $	*/
+/*	$NetBSD: sa11x0_irq.S,v 1.2 2002/04/12 18:50:32 thorpej Exp $	*/

 /*
 * Copyright (c) 1998 Mark Brinicombe.
@ -37,7 +37,6 @@
 * SUCH DAMAGE.
 */

-#include "opt_cputypes.h"
 #include "opt_irqstats.h"

 #include "assym.h"
--- a/sys/arch/arm/sa11x0/sa11x0_irqhandler.c
+++ b/sys/arch/arm/sa11x0/sa11x0_irqhandler.c
@ -1,4 +1,4 @@
-/*	$NetBSD: sa11x0_irqhandler.c,v 1.1 2001/07/08 23:37:53 rjs Exp $	*/
+/*	$NetBSD: sa11x0_irqhandler.c,v 1.2 2002/04/12 18:50:32 thorpej Exp $	*/

 /*-
 * Copyright (c) 1996, 1997, 1998, 2001 The NetBSD Foundation, Inc.
@ -79,7 +79,6 @@
 */


-#include "opt_cputypes.h"
 #include "opt_irqstats.h"

 #include <sys/param.h>
--- a/sys/arch/cats/include/irqhandler.h
+++ b/sys/arch/cats/include/irqhandler.h
@ -1,4 +1,4 @@
-/*	$NetBSD: irqhandler.h,v 1.3 2002/02/20 22:32:10 skrll Exp $	*/
+/*	$NetBSD: irqhandler.h,v 1.4 2002/04/12 18:50:32 thorpej Exp $	*/

 /*
 * Copyright (c) 1994-1996 Mark Brinicombe.
@ -43,10 +43,6 @@
 #ifndef _ARM32_IRQHANDLER_H_
 #define _ARM32_IRQHANDLER_H_

-#if defined(_KERNEL_OPT)
-#include "opt_cputypes.h"
-#endif
-
 #ifndef _LOCORE
 #include <sys/types.h>
 #endif /* _LOCORE */
--- a/sys/arch/evbarm/ifpga/ifpga.c
+++ b/sys/arch/evbarm/ifpga/ifpga.c
@ -1,4 +1,4 @@
-/*	$NetBSD: ifpga.c,v 1.6 2002/01/30 03:59:41 thorpej Exp $ */
+/*	$NetBSD: ifpga.c,v 1.7 2002/04/12 18:50:32 thorpej Exp $ */

 /*
 * Copyright (c) 2001 ARM Ltd
@ -52,7 +52,6 @@

 #include <arm/cpufunc.h>

-#include "opt_cputypes.h"
 #include "opt_pci.h"
 #include "pci.h"

--- a/sys/arch/evbarm/ifpga/irqhandler.h
+++ b/sys/arch/evbarm/ifpga/irqhandler.h
@ -1,4 +1,4 @@
-/*	$NetBSD: irqhandler.h,v 1.1 2002/01/30 03:59:41 thorpej Exp $	*/
+/*	$NetBSD: irqhandler.h,v 1.2 2002/04/12 18:50:32 thorpej Exp $	*/

 /*
 * Copyright (c) 1994-1996 Mark Brinicombe.
@ -50,10 +50,6 @@
 #ifndef _ARM32_IRQHANDLER_H_
 #define _ARM32_IRQHANDLER_H_

-#if defined(_KERNEL) && !defined(_LKM)
-#include "opt_cputypes.h"
-#endif
-
 #ifndef _LOCORE
 #include <sys/types.h>
 #endif /* _LOCORE */
--- a/sys/arch/hpcarm/hpcarm/hpc_machdep.c
+++ b/sys/arch/hpcarm/hpcarm/hpc_machdep.c
@ -1,4 +1,4 @@
-/*	$NetBSD: hpc_machdep.c,v 1.45 2002/04/09 22:37:03 thorpej Exp $	*/
+/*	$NetBSD: hpc_machdep.c,v 1.46 2002/04/12 18:50:33 thorpej Exp $	*/

 /*
 * Copyright (c) 1994-1998 Mark Brinicombe.
@ -48,7 +48,6 @@
 * hpc_machdep.c 
 */

-#include "opt_cputypes.h"
 #include "opt_ddb.h"
 #include "opt_pmap_debug.h"

@ -83,6 +82,7 @@
 #include <machine/intr.h>
 #include <arm/arm32/katelib.h>
 #include <machine/bootinfo.h>
+#include <arm/cpuconf.h>
 #include <arm/undefined.h>
 #include <machine/rtc.h>
 #include <machine/platid.h>
--- a/sys/arch/hpcarm/include/irqhandler.h
+++ b/sys/arch/hpcarm/include/irqhandler.h
@ -1,4 +1,4 @@
-/*	$NetBSD: irqhandler.h,v 1.4 2001/12/20 01:20:29 thorpej Exp $	*/
+/*	$NetBSD: irqhandler.h,v 1.5 2002/04/12 18:50:33 thorpej Exp $	*/

 /*
 * Copyright (c) 1994-1996 Mark Brinicombe.
@ -43,10 +43,6 @@
 #ifndef _HPCARM_IRQHANDLER_H_
 #define _HPCARM_IRQHANDLER_H_

-#if defined(_KERNEL_OPT)
-#include "opt_cputypes.h"
-#endif
-
 #ifndef _LOCORE
 #include <sys/types.h>
 #endif /* _LOCORE */
--- a/sys/arch/hpcarm/sa11x0/sa11x0_irq.S
+++ b/sys/arch/hpcarm/sa11x0/sa11x0_irq.S
@ -1,4 +1,4 @@
-/*	$NetBSD: sa11x0_irq.S,v 1.6 2001/05/22 17:01:17 toshii Exp $	*/
+/*	$NetBSD: sa11x0_irq.S,v 1.7 2002/04/12 18:50:33 thorpej Exp $	*/

 /*
 * Copyright (c) 1998 Mark Brinicombe.
@ -37,7 +37,6 @@
 * SUCH DAMAGE.
 */

-#include "opt_cputypes.h"
 #include "opt_irqstats.h"

 #include "assym.h"
--- a/sys/arch/hpcarm/sa11x0/sa11x0_irqhandler.c
+++ b/sys/arch/hpcarm/sa11x0/sa11x0_irqhandler.c
@ -1,4 +1,4 @@
-/*	$NetBSD: sa11x0_irqhandler.c,v 1.7 2001/06/20 02:18:06 toshii Exp $	*/
+/*	$NetBSD: sa11x0_irqhandler.c,v 1.8 2002/04/12 18:50:33 thorpej Exp $	*/

 /*-
 * Copyright (c) 1996, 1997, 1998, 2001 The NetBSD Foundation, Inc.
@ -78,8 +78,6 @@
 *	@(#)isa.c	7.2 (Berkeley) 5/13/91
 */

-
-#include "opt_cputypes.h"
 #include "opt_irqstats.h"

 #include <sys/param.h>
--- a/sys/arch/netwinder/include/irqhandler.h
+++ b/sys/arch/netwinder/include/irqhandler.h
@ -1,4 +1,4 @@
-/*	$NetBSD: irqhandler.h,v 1.4 2002/04/10 22:35:17 thorpej Exp $	*/
+/*	$NetBSD: irqhandler.h,v 1.5 2002/04/12 18:50:33 thorpej Exp $	*/

 /*
 * Copyright (c) 1994-1996 Mark Brinicombe.
@ -43,10 +43,6 @@
 #ifndef _ARM32_IRQHANDLER_H_
 #define _ARM32_IRQHANDLER_H_

-#if defined(_KERNEL_OPT)
-#include "opt_cputypes.h"
-#endif
-
 #ifndef _LOCORE
 #include <sys/types.h>
 #endif /* _LOCORE */