Nuke defopt remains. Tested on cats and zaurus.

4 files changed, 9 insertions, 47 deletions

diff --git a/sys/arch/arm/include/bus.h b/sys/arch/arm/include/bus.h
index 01dfec5d2b7..b2b2e80bbff 100644
--- a/sys/arch/arm/include/bus.h
+++ b/sys/arch/arm/include/bus.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bus.h,v 1.5 2006/05/26 20:22:04 miod Exp $	*/
+/*	$OpenBSD: bus.h,v 1.6 2006/05/27 20:36:05 miod Exp $	*/
 /*	$NetBSD: bus.h,v 1.12 2003/10/23 15:03:24 scw Exp $	*/
 
 /*-
@@ -72,10 +72,6 @@
 #ifndef _ARM32_BUS_H_
 #define _ARM32_BUS_H_
 
-#if defined(_KERNEL_OPT)
-#include "opt_arm_bus_space.h"
-#endif
-
 /*
  * Addresses (in bus space).
  */
diff --git a/sys/arch/arm/include/cpuconf.h b/sys/arch/arm/include/cpuconf.h
index d988ef93bf4..ef8918445bf 100644
--- a/sys/arch/arm/include/cpuconf.h
+++ b/sys/arch/arm/include/cpuconf.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpuconf.h,v 1.2 2004/12/30 23:40:07 drahn Exp $	*/
+/*	$OpenBSD: cpuconf.h,v 1.3 2006/05/27 20:36:05 miod Exp $	*/
 /*	$NetBSD: cpuconf.h,v 1.7 2003/05/23 00:57:24 ichiro Exp $	*/
 
 /*
@@ -46,28 +46,7 @@
  */
 
 /*
- * 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_ARM10) +				\
-			 defined(CPU_SA110) + defined(CPU_SA1100) +	\
-			 defined(CPU_SA1110) +				\
-			 defined(CPU_IXP12X0) +				\
-			 defined(CPU_XSCALE_80200) +			\
-			 defined(CPU_XSCALE_80321) +			\
-			 defined(CPU_XSCALE_PXA2X0) + 			\
-			 defined(CPU_XSCALE_IXP425))
-#else
-#define	CPU_NTYPES	2
-#endif /* _KERNEL_OPT */
-
-/*
- * Step 2: Determine which ARM architecture versions are configured.
+ * Determine which ARM architecture versions are configured.
  */
 #if (defined(CPU_ARM2) || defined(CPU_ARM250) || defined(CPU_ARM3))
 #define	ARM_ARCH_2	1
@@ -96,13 +75,8 @@
 #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:
+ * Define which MMU classes are configured:
  *
  *	ARM_MMU_MEMC		Prehistoric, external memory controller
  *				and MMU for ARMv2 CPUs.
@@ -145,18 +119,14 @@
 
 #define	ARM_NMMUS		(ARM_MMU_MEMC + ARM_MMU_GENERIC +	\
 				 ARM_MMU_SA1 + ARM_MMU_XSCALE)
-#if ARM_NMMUS == 0
-#error ARM_NMMUS is 0
-#endif
 
 /*
- * Step 4: Define features that may be present on a subset of CPUs
+ * Define features that may be present on a subset of CPUs
  *
  *	ARM_XSCALE_PMU		Performance Monitoring Unit on 80200 and 80321
  */
 
-#if !defined(_KERNEL_OPT) ||						\
-    (defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321))
+#if (defined(CPU_XSCALE_80200) || defined(CPU_XSCALE_80321))
 #define ARM_XSCALE_PMU	1
 #else
 #define ARM_XSCALE_PMU	0
diff --git a/sys/arch/arm/include/pcb.h b/sys/arch/arm/include/pcb.h
index 29303fc170b..b50827f5627 100644
--- a/sys/arch/arm/include/pcb.h
+++ b/sys/arch/arm/include/pcb.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pcb.h,v 1.2 2006/03/07 20:20:30 miod Exp $	*/
+/*	$OpenBSD: pcb.h,v 1.3 2006/05/27 20:36:05 miod Exp $	*/
 /*	$NetBSD: pcb.h,v 1.10 2003/10/13 21:46:39 scw Exp $	*/
 
 /*
@@ -101,9 +101,6 @@ struct md_coredump {
 };
 
 #ifdef _KERNEL
-#ifdef _KERNEL_OPT
-#include "opt_multiprocessor.h"
-#endif
 #ifdef MULTIPROCESSOR
 #define curpcb	(curcpu()->ci_curpcb)
 #else
diff --git a/sys/arch/arm/include/pmap.h b/sys/arch/arm/include/pmap.h
index bf8cff16d6b..6e0acc7346e 100644
--- a/sys/arch/arm/include/pmap.h
+++ b/sys/arch/arm/include/pmap.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pmap.h,v 1.5 2006/05/26 17:11:41 miod Exp $	*/
+/*	$OpenBSD: pmap.h,v 1.6 2006/05/27 20:36:05 miod Exp $	*/
 /*	$NetBSD: pmap.h,v 1.76 2003/09/06 09:10:46 rearnsha Exp $	*/
 
 /*
@@ -335,7 +335,7 @@ vtophys(vaddr_t va)
  * the code.
  */
 extern int pmap_needs_pte_sync;
-#if defined(_KERNEL_OPT)
+
 /*
  * StrongARM SA-1 caches do not have a write-through mode.  So, on these,
  * we need to do PTE syncs.  If only SA-1 is configured, then evaluate
@@ -347,7 +347,6 @@ extern int pmap_needs_pte_sync;
 #elif (ARM_MMU_SA1 == 0)
 #define	PMAP_NEEDS_PTE_SYNC	0
 #endif
-#endif /* _KERNEL_OPT */
 
 /*
  * Provide a fallback in case we were not able to determine it at