defopt CPU_* options in opt_cputypes.h

1998-07-07 03:05:15 +00:00 · 1998-07-07 03:05:15 +00:00 · 4a463e49fe
commit 4a463e49fe
parent d94474ccc9
13 changed files with 36 additions and 15 deletions
--- a/sys/arch/arm32/conf/files.arm32
+++ b/sys/arch/arm32/conf/files.arm32
@ -1,4 +1,4 @@
-#	$NetBSD: files.arm32,v 1.46 1998/07/06 02:35:34 mark Exp $
+#	$NetBSD: files.arm32,v 1.47 1998/07/07 03:05:15 mark Exp $
 #
 # First try for arm-specific configuration info
 #
@ -9,6 +9,9 @@ maxusers 2 8 64
 # Floating point emulator
 defopt	ARMFPE

+# CPU types
+defopt	opt_cputypes.h CPU_ARM6 CPU_ARM7 CPU_ARM7500 CPU_ARM8 CPU_SA110
+
 # COMPAT_OLD_OFW for SHARKs
 defopt	COMPAT_OLD_OFW

--- a/sys/arch/arm32/include/cpu.h
+++ b/sys/arch/arm32/include/cpu.h
@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.h,v 1.15 1998/02/21 22:49:18 mark Exp $	*/
+/*	$NetBSD: cpu.h,v 1.16 1998/07/07 03:05:15 mark Exp $	*/

 /*
 * Copyright (c) 1994-1996 Mark Brinicombe.
@ -48,6 +48,8 @@
 #ifndef _ARM32_CPU_H_
 #define _ARM32_CPU_H_

+#include "opt_cputypes.h"
+
 #ifndef _LOCORE
 #include <machine/frame.h>
 #endif	/* !_LOCORE */
--- a/sys/arch/arm32/include/cpufunc.h
+++ b/sys/arch/arm32/include/cpufunc.h
@ -1,4 +1,4 @@
-/*	$NetBSD: cpufunc.h,v 1.8 1998/02/22 00:05:56 mark Exp $	*/
+/*	$NetBSD: cpufunc.h,v 1.9 1998/07/07 03:05:15 mark Exp $	*/

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

+#include "opt_cputypes.h"
+
 #include <sys/types.h>

 #ifdef _KERNEL
--- a/sys/arch/arm32/include/irqhandler.h
+++ b/sys/arch/arm32/include/irqhandler.h
@ -1,4 +1,4 @@
-/*	$NetBSD: irqhandler.h,v 1.12 1998/06/17 19:36:33 mark Exp $	*/
+/*	$NetBSD: irqhandler.h,v 1.13 1998/07/07 03:05:15 mark Exp $	*/

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

+#include "opt_cputypes.h"
+
 #ifndef _LOCORE
 #include <sys/types.h>
 #endif /* _LOCORE */
--- a/sys/arch/arm32/include/vidc.h
+++ b/sys/arch/arm32/include/vidc.h
@ -1,4 +1,4 @@
-/*	$NetBSD: vidc.h,v 1.6 1997/10/14 09:20:39 mark Exp $	*/
+/*	$NetBSD: vidc.h,v 1.7 1998/07/07 03:05:16 mark Exp $	*/

 /*
 * Copyright (c) 1994,1995 Mark Brinicombe.
@ -55,6 +55,8 @@
 #ifndef	_ARM32_VIDC_H_
 #define	_ARM32_VIDC_H_

+#include "opt_cputypes.h"
+
 /* VIDC20 Base addresses */

 #define VIDC_HW_BASE 0x03400000
--- a/sys/arch/arm32/iomd/iomd_irq.S
+++ b/sys/arch/arm32/iomd/iomd_irq.S
@ -1,4 +1,4 @@
-/*	$NetBSD: iomd_irq.S,v 1.17 1998/07/06 00:53:07 mark Exp $	*/
+/*	$NetBSD: iomd_irq.S,v 1.18 1998/07/07 03:05:16 mark Exp $	*/

 /*
 * Copyright (c) 1994-1997 Mark Brinicombe.
@ -43,8 +43,9 @@
 * Created      : 27/09/94
 */

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

 #include "assym.h"
 #include <machine/asm.h>
--- a/sys/arch/arm32/iomd/iomd_irqhandler.c
+++ b/sys/arch/arm32/iomd/iomd_irqhandler.c
@ -1,4 +1,4 @@
-/*	$NetBSD: iomd_irqhandler.c,v 1.17 1998/07/06 00:53:07 mark Exp $	*/
+/*	$NetBSD: iomd_irqhandler.c,v 1.18 1998/07/07 03:05:16 mark Exp $	*/

 /*
 * Copyright (c) 1994-1996 Mark Brinicombe.
@ -43,6 +43,7 @@
 *	from: irqhandler.c,v 1.14 1997/04/02 21:52:19 christos Exp $
 */

+#include "opt_cputypes.h"
 #include "opt_irqstats.h"

 #include <sys/param.h>
--- a/sys/arch/arm32/isa/isa_irq.S
+++ b/sys/arch/arm32/isa/isa_irq.S
@ -1,4 +1,4 @@
-/*	$NetBSD: isa_irq.S,v 1.3 1998/07/06 00:53:07 mark Exp $	*/
+/*	$NetBSD: isa_irq.S,v 1.4 1998/07/07 03:05:16 mark Exp $	*/

 /*
 * Copyright 1997
@ -76,7 +76,9 @@
 * Created      : 27/09/94
 */

+#include "opt_cputypes.h"
 #include "opt_irqstats.h"
+#include "opt_uvm.h"

 #include "assym.h"
 #include <machine/cpu.h>
@ -85,7 +87,6 @@
 #include <arm32/isa/icu.h>
 #include <machine/asm.h>
 #include <machine/irqhandler.h>
-#include "opt_uvm.h"

 sp	.req	r13
 lr	.req	r14
--- a/sys/arch/arm32/mainbus/cpu.c
+++ b/sys/arch/arm32/mainbus/cpu.c
@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.c,v 1.17 1998/07/06 18:13:26 mark Exp $	*/
+/*	$NetBSD: cpu.c,v 1.18 1998/07/07 03:05:16 mark Exp $	*/

 /*
 * Copyright (c) 1995 Mark Brinicombe.
@ -42,6 +42,7 @@
 */

 #include "opt_armfpe.h"
+#include "opt_cputypes.h"

 #include <sys/param.h>
 #include <sys/systm.h>
--- a/sys/arch/arm32/podulebus/podulebus.c
+++ b/sys/arch/arm32/podulebus/podulebus.c
@ -1,4 +1,4 @@
-/* $NetBSD: podulebus.c,v 1.29 1998/03/21 21:30:07 mark Exp $ */
+/* $NetBSD: podulebus.c,v 1.30 1998/07/07 03:05:16 mark Exp $ */

 /*
 * Copyright (c) 1994-1996 Mark Brinicombe.
@ -41,6 +41,8 @@
 * Created      : 07/11/94
 */

+#include "opt_cputypes.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
--- a/sys/arch/arm32/riscpc/rpc_machdep.c
+++ b/sys/arch/arm32/riscpc/rpc_machdep.c
@ -1,4 +1,4 @@
-/*	$NetBSD: rpc_machdep.c,v 1.10 1998/07/06 02:40:44 mark Exp $	*/
+/*	$NetBSD: rpc_machdep.c,v 1.11 1998/07/07 03:05:17 mark Exp $	*/

 /*
 * Copyright (c) 1994-1998 Mark Brinicombe.
@ -45,6 +45,7 @@
 * Created      : 17/09/94
 */

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

--- a/sys/arch/arm32/vidc/beep.c
+++ b/sys/arch/arm32/vidc/beep.c
@ -1,4 +1,4 @@
-/*	$NetBSD: beep.c,v 1.13 1998/06/02 20:41:55 mark Exp $	*/
+/*	$NetBSD: beep.c,v 1.14 1998/07/07 03:05:17 mark Exp $	*/

 /*
 * Copyright (c) 1995 Mark Brinicombe
@ -42,7 +42,9 @@
 *
 */

+#include "opt_cputypes.h"
 #include "opt_uvm.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
--- a/sys/arch/arm32/vidc/vidcaudio.c
+++ b/sys/arch/arm32/vidc/vidcaudio.c
@ -1,4 +1,4 @@
-/*	$NetBSD: vidcaudio.c,v 1.23 1998/06/02 20:41:55 mark Exp $	*/
+/*	$NetBSD: vidcaudio.c,v 1.24 1998/07/07 03:05:17 mark Exp $	*/

 /*
 * Copyright (c) 1995 Melvin Tang-Richardson
@ -43,6 +43,7 @@
 *
 */

+#include "opt_cputypes.h"
 #include "opt_uvm.h"

 #include <sys/param.h>	/* proc.h */