[src/trunk]: src/sys/arch fix PR 6724 - convert m68k options to defflag's. t...

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

details:   https://anonhg.NetBSD.org/src/rev/7dc43f37b164
branches:  trunk
changeset: 755437:7dc43f37b164
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sun Jun 06 04:51:33 2010 +0000

description:
fix PR 6724 - convert m68k options to defflag's.  this means that
M680[12346] are now available from opt_m68k_arch.h.  FPSP meantioned
in the PR has already been fixed, and i could not find any more.

i built these kernels to ensure i did not break their builds:

amiga: GENERIC DRACO
atari: HADES FALCON MILAN-PCIIDE
mac68k: GENERIC
sun2: GENERIC
sun3: GENERIC GENERIC3X
cesfic: attempted GENERIC, does not build due to lack of machine/bus.h
hp300: GENERIC
luna68k: GENERIC
mvme68k: GENERIC
news68k: GENERIC
next68k: GENERIC
x68k: GENERIC

diffstat:

 sys/arch/m68k/conf/files.m68k |  7 ++++++-
 sys/arch/x68k/conf/files.x68k |  4 +---
 sys/arch/x68k/dev/fd.c        |  6 +++---
 sys/arch/x68k/include/cpu.h   |  4 ++--
 4 files changed, 12 insertions(+), 9 deletions(-)

diffs (75 lines):

diff -r b8e3eec74be3 -r 7dc43f37b164 sys/arch/m68k/conf/files.m68k
--- a/sys/arch/m68k/conf/files.m68k     Sun Jun 06 04:51:13 2010 +0000
+++ b/sys/arch/m68k/conf/files.m68k     Sun Jun 06 04:51:33 2010 +0000
@@ -1,7 +1,12 @@
-#      $NetBSD: files.m68k,v 1.45 2008/11/19 18:35:59 ad Exp $
+#      $NetBSD: files.m68k,v 1.46 2010/06/06 04:51:33 mrg Exp $
 #
 
 defflag        opt_fpsp.h              FPSP
+defflag        opt_m68k_arch.h         M68010
+defflag        opt_m68k_arch.h         M68020
+defflag        opt_m68k_arch.h         M68030
+defflag        opt_m68k_arch.h         M68040
+defflag        opt_m68k_arch.h         M68060
 defflag                                FPU_EMULATE
 defflag                                PMAP_DEBUG
 
diff -r b8e3eec74be3 -r 7dc43f37b164 sys/arch/x68k/conf/files.x68k
--- a/sys/arch/x68k/conf/files.x68k     Sun Jun 06 04:51:13 2010 +0000
+++ b/sys/arch/x68k/conf/files.x68k     Sun Jun 06 04:51:33 2010 +0000
@@ -1,12 +1,10 @@
-#      $NetBSD: files.x68k,v 1.70 2009/08/21 04:12:27 thorpej Exp $
+#      $NetBSD: files.x68k,v 1.71 2010/06/06 04:52:01 mrg Exp $
 #
 # new style config file for x68k architecture
 #
 
 defflag                                M060SP
 
-defflag        opt_m680x0.h            M68020 M68030 M68040 M68060
-
 defflag                                JUPITER
 defflag                                PANICBUTTON
 defflag        opt_extmem.h            EXTENDED_MEMORY
diff -r b8e3eec74be3 -r 7dc43f37b164 sys/arch/x68k/dev/fd.c
--- a/sys/arch/x68k/dev/fd.c    Sun Jun 06 04:51:13 2010 +0000
+++ b/sys/arch/x68k/dev/fd.c    Sun Jun 06 04:51:33 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: fd.c,v 1.92 2009/01/18 02:40:05 isaki Exp $    */
+/*     $NetBSD: fd.c,v 1.93 2010/06/06 04:52:01 mrg Exp $      */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -64,11 +64,11 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.92 2009/01/18 02:40:05 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.93 2010/06/06 04:52:01 mrg Exp $");
 
 #include "rnd.h"
 #include "opt_ddb.h"
-#include "opt_m680x0.h"
+#include "opt_m68k_arch.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
diff -r b8e3eec74be3 -r 7dc43f37b164 sys/arch/x68k/include/cpu.h
--- a/sys/arch/x68k/include/cpu.h       Sun Jun 06 04:51:13 2010 +0000
+++ b/sys/arch/x68k/include/cpu.h       Sun Jun 06 04:51:33 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpu.h,v 1.49 2009/10/21 21:12:04 rmind Exp $   */
+/*     $NetBSD: cpu.h,v 1.50 2010/06/06 04:52:01 mrg Exp $     */
 
 /*
  * Copyright (c) 1982, 1990, 1993
@@ -86,7 +86,7 @@
  */
 
 #if defined(_KERNEL_OPT)
-#include "opt_m680x0.h"
+#include "opt_m68k_arch.h"
 #include "opt_lockdebug.h"
 #endif