Module Name: src
Committed By: mrg
Date: Sun Jun 6 04:52:01 UTC 2010
Modified Files:
src/sys/arch/x68k/conf: files.x68k
src/sys/arch/x68k/dev: fd.c
src/sys/arch/x68k/include: cpu.h
Log Message:
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
To generate a diff of this commit:
cvs rdiff -u -r1.70 -r1.71 src/sys/arch/x68k/conf/files.x68k
cvs rdiff -u -r1.92 -r1.93 src/sys/arch/x68k/dev/fd.c
cvs rdiff -u -r1.49 -r1.50 src/sys/arch/x68k/include/cpu.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x68k/conf/files.x68k
diff -u src/sys/arch/x68k/conf/files.x68k:1.70 src/sys/arch/x68k/conf/files.x68k:1.71
--- src/sys/arch/x68k/conf/files.x68k:1.70 Fri Aug 21 04:12:27 2009
+++ src/sys/arch/x68k/conf/files.x68k Sun Jun 6 04:52:01 2010
@@ -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
Index: src/sys/arch/x68k/dev/fd.c
diff -u src/sys/arch/x68k/dev/fd.c:1.92 src/sys/arch/x68k/dev/fd.c:1.93
--- src/sys/arch/x68k/dev/fd.c:1.92 Sun Jan 18 02:40:05 2009
+++ src/sys/arch/x68k/dev/fd.c Sun Jun 6 04:52:01 2010
@@ -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>
Index: src/sys/arch/x68k/include/cpu.h
diff -u src/sys/arch/x68k/include/cpu.h:1.49 src/sys/arch/x68k/include/cpu.h:1.50
--- src/sys/arch/x68k/include/cpu.h:1.49 Wed Oct 21 21:12:04 2009
+++ src/sys/arch/x68k/include/cpu.h Sun Jun 6 04:52:01 2010
@@ -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
