[src/trunk]: src/sys/arch/sparc64 defopt "options SUN4*", put #define for eac...

[darrenr <darrenr%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/58d1c8f24cb9
branches:  trunk
changeset: 518685:58d1c8f24cb9
user:      darrenr <darrenr%NetBSD.org@localhost>
date:      Tue Dec 04 00:53:18 2001 +0000

description:
defopt "options SUN4*", put #define for each of SUN4, SUN4C, SUN4M and SUN4U
into opt_arch_sparc.h and include this wherever they are used.

diffstat:

 sys/arch/sparc64/conf/files.sparc64     |  4 +++-
 sys/arch/sparc64/include/bsd_openprom.h |  6 +++++-
 sys/arch/sparc64/include/frame.h        |  6 +++++-
 sys/arch/sparc64/include/idprom.h       |  6 +++++-
 sys/arch/sparc64/include/kbd.h          |  6 +++++-
 sys/arch/sparc64/include/oldmon.h       |  6 +++++-
 sys/arch/sparc64/include/param.h        |  9 +++++++--
 sys/arch/sparc64/include/pte.h          |  6 +++++-
 sys/arch/sparc64/include/types.h        |  6 +++++-
 sys/arch/sparc64/sparc64/cpuvar.h       |  6 +++++-
 10 files changed, 50 insertions(+), 11 deletions(-)

diffs (208 lines):

diff -r 14be0da27fe9 -r 58d1c8f24cb9 sys/arch/sparc64/conf/files.sparc64
--- a/sys/arch/sparc64/conf/files.sparc64       Tue Dec 04 00:12:45 2001 +0000
+++ b/sys/arch/sparc64/conf/files.sparc64       Tue Dec 04 00:53:18 2001 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.sparc64,v 1.55 2001/11/20 12:56:39 lukem Exp $
+#      $NetBSD: files.sparc64,v 1.56 2001/12/04 00:53:18 darrenr Exp $
 
 # @(#)files.sparc64    8.1 (Berkeley) 7/19/93
 # sparc64-specific configuration info
@@ -8,6 +8,8 @@
 
 maxusers 2 8 1024
 
+defopt opt_sparc_arch.h        SUN4U
+
 #
 # XXXXXXXXXXX
 #
diff -r 14be0da27fe9 -r 58d1c8f24cb9 sys/arch/sparc64/include/bsd_openprom.h
--- a/sys/arch/sparc64/include/bsd_openprom.h   Tue Dec 04 00:12:45 2001 +0000
+++ b/sys/arch/sparc64/include/bsd_openprom.h   Tue Dec 04 00:53:18 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bsd_openprom.h,v 1.2 2000/03/13 23:52:34 soren Exp $ */
+/*     $NetBSD: bsd_openprom.h,v 1.3 2001/12/04 00:53:19 darrenr Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -38,6 +38,10 @@
  *     @(#)bsd_openprom.h      8.1 (Berkeley) 6/11/93
  */
 
+#if defined(_KERNEL_OPT)
+#include "opt_sparc_arch.h"
+#endif
+
 /*
  * Sun4m support by Aaron Brown, Harvard University.
  * Changes Copyright (c) 1995 The President and Fellows of Harvard College.
diff -r 14be0da27fe9 -r 58d1c8f24cb9 sys/arch/sparc64/include/frame.h
--- a/sys/arch/sparc64/include/frame.h  Tue Dec 04 00:12:45 2001 +0000
+++ b/sys/arch/sparc64/include/frame.h  Tue Dec 04 00:53:18 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: frame.h,v 1.9 2001/03/04 09:28:35 mrg Exp $ */
+/*     $NetBSD: frame.h,v 1.10 2001/12/04 00:53:19 darrenr Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -44,6 +44,10 @@
  *     @(#)frame.h     8.1 (Berkeley) 6/11/93
  */
 
+#if defined(_KERNEL_OPT)
+#include "opt_sparc_arch.h"
+#endif
+
 /*
  * Sparc stack frame format.
  *
diff -r 14be0da27fe9 -r 58d1c8f24cb9 sys/arch/sparc64/include/idprom.h
--- a/sys/arch/sparc64/include/idprom.h Tue Dec 04 00:12:45 2001 +0000
+++ b/sys/arch/sparc64/include/idprom.h Tue Dec 04 00:53:18 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: idprom.h,v 1.2 1998/09/05 23:57:26 eeh Exp $ */
+/*     $NetBSD: idprom.h,v 1.3 2001/12/04 00:53:19 darrenr Exp $ */
 
 /*
  * Copyright (c) 1993 Adam Glass
@@ -31,6 +31,10 @@
  * SUCH DAMAGE.
  */
 
+#if defined(_KERNEL_OPT)
+#include "opt_sparc_arch.h"
+#endif
+
 /*
  * ID prom format.  The ``host id'' is set up by taking the machine
  * ID as the top byte and the hostid field as the remaining three.
diff -r 14be0da27fe9 -r 58d1c8f24cb9 sys/arch/sparc64/include/kbd.h
--- a/sys/arch/sparc64/include/kbd.h    Tue Dec 04 00:12:45 2001 +0000
+++ b/sys/arch/sparc64/include/kbd.h    Tue Dec 04 00:53:18 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kbd.h,v 1.1.1.1 1998/06/20 04:58:51 eeh Exp $ */
+/*     $NetBSD: kbd.h,v 1.2 2001/12/04 00:53:19 darrenr Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -44,6 +44,10 @@
  *     @(#)kbd.h       8.1 (Berkeley) 6/11/93
  */
 
+#if defined(_KERNEL_OPT)
+#include "opt_sparc_arch.h"
+#endif
+
 /*
  * Keyboard `registers'.  (This should be called kbd_reg.h but we need to
  * be compatible.)
diff -r 14be0da27fe9 -r 58d1c8f24cb9 sys/arch/sparc64/include/oldmon.h
--- a/sys/arch/sparc64/include/oldmon.h Tue Dec 04 00:12:45 2001 +0000
+++ b/sys/arch/sparc64/include/oldmon.h Tue Dec 04 00:53:18 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: oldmon.h,v 1.1.1.1 1998/06/20 04:58:51 eeh Exp $ */
+/*     $NetBSD: oldmon.h,v 1.2 2001/12/04 00:53:19 darrenr Exp $ */
 
 /*
  * Copyright (C) 1985 Regents of the University of California
@@ -37,6 +37,10 @@
 #ifndef _MACHINE_OLDMON_H
 #define _MACHINE_OLDMON_H
 
+#if defined(_KERNEL_OPT)
+#include "opt_sparc_arch.h"
+#endif
+
 /*
  *     Structures, constants and defines for access to the sun monitor.
  *     These are translated from the sun monitor header file "sunromvec.h".
diff -r 14be0da27fe9 -r 58d1c8f24cb9 sys/arch/sparc64/include/param.h
--- a/sys/arch/sparc64/include/param.h  Tue Dec 04 00:12:45 2001 +0000
+++ b/sys/arch/sparc64/include/param.h  Tue Dec 04 00:53:18 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: param.h,v 1.25 2001/05/30 12:28:51 mrg Exp $ */
+/*     $NetBSD: param.h,v 1.26 2001/12/04 00:53:19 darrenr Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -67,7 +67,9 @@
  *
  */
 
-
+#if defined(_KERNEL_OPT)
+#include "opt_sparc_arch.h"
+#endif
 
 #define        _MACHINE        sparc64
 #define        MACHINE         "sparc64"
@@ -81,6 +83,9 @@
 #define        MID_MACHINE     MID_SPARC
 #endif
 
+#ifdef _KERNEL_OPT
+#include "opt_sparc_arch.h"
+#endif
 #ifdef _KERNEL                         /* XXX */
 #ifndef _LOCORE                                /* XXX */
 #include <machine/cpu.h>               /* XXX */
diff -r 14be0da27fe9 -r 58d1c8f24cb9 sys/arch/sparc64/include/pte.h
--- a/sys/arch/sparc64/include/pte.h    Tue Dec 04 00:12:45 2001 +0000
+++ b/sys/arch/sparc64/include/pte.h    Tue Dec 04 00:53:18 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pte.h,v 1.8 2001/08/30 09:32:23 mrg Exp $ */
+/*     $NetBSD: pte.h,v 1.9 2001/12/04 00:53:19 darrenr Exp $ */
 
 /*
  * Copyright (c) 1996-1999 Eduardo Horvath
@@ -23,6 +23,10 @@
  *
  */
 
+#if defined(_KERNEL_OPT)
+#include "opt_sparc_arch.h"
+#endif
+
 /*
  * Address translation works as follows:
  *
diff -r 14be0da27fe9 -r 58d1c8f24cb9 sys/arch/sparc64/include/types.h
--- a/sys/arch/sparc64/include/types.h  Tue Dec 04 00:12:45 2001 +0000
+++ b/sys/arch/sparc64/include/types.h  Tue Dec 04 00:53:18 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: types.h,v 1.17 2001/05/12 22:42:07 kleink Exp $ */
+/*     $NetBSD: types.h,v 1.18 2001/12/04 00:53:19 darrenr Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -51,6 +51,10 @@
 #undef sun
 #endif
 
+#if defined(_KERNEL_OPT)
+#include "opt_sparc_arch.h"
+#endif
+
 #include <sys/cdefs.h>
 #include <machine/int_types.h>
 
diff -r 14be0da27fe9 -r 58d1c8f24cb9 sys/arch/sparc64/sparc64/cpuvar.h
--- a/sys/arch/sparc64/sparc64/cpuvar.h Tue Dec 04 00:12:45 2001 +0000
+++ b/sys/arch/sparc64/sparc64/cpuvar.h Tue Dec 04 00:53:18 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpuvar.h,v 1.2 1999/11/06 20:18:13 eeh Exp $ */
+/*     $NetBSD: cpuvar.h,v 1.3 2001/12/04 00:53:20 darrenr Exp $ */
 
 /*
  *  Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -39,6 +39,10 @@
 #ifndef _sparc64_cpuvar_h
 #define _sparc64_cpuvar_h
 
+#if defined(_KERNEL_OPT)
+#include "opt_sparc_arch.h"
+#endif
+
 #include <sys/device.h>
 
 #include <sparc64/sparc64/cache.h>     /* for cacheinfo */