Module Name: src
Committed By: tsutsui
Date: Sun Sep 19 02:09:29 UTC 2010
Modified Files:
src/sys/arch/amiga/conf: std.amiga
src/sys/arch/atari/conf: std.atari std.hades std.milan
src/sys/arch/cesfic/conf: std.cesfic
src/sys/arch/hp300/conf: std.hp300
src/sys/arch/luna68k/conf: std.luna68k
src/sys/arch/mac68k/conf: std.mac68k
src/sys/arch/mvme68k/conf: std.mvme68k
src/sys/arch/news68k/conf: std.news68k
src/sys/arch/next68k/conf: std.next68k
src/sys/arch/sun2/conf: std.sun2
src/sys/arch/sun3/conf: std.sun3 std.sun3x
src/sys/arch/x68k/conf: std.x68k
Added Files:
src/sys/arch/m68k/conf: std.m68k
Log Message:
- add m68k/conf/std.m68k, which includes common standard options for m68k,
options EXEC_ELF32, EXEC_SCRIPTS, and CPU_IN_CKSUM for md cpu_in_cksum.c
- make all m68k ports include common arch/m68k/conf/std.m68k
from MD std.${MACHINE}
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/amiga/conf/std.amiga
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/atari/conf/std.atari
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/atari/conf/std.hades
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/atari/conf/std.milan
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/cesfic/conf/std.cesfic
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/hp300/conf/std.hp300
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/luna68k/conf/std.luna68k
cvs rdiff -u -r0 -r1.1 src/sys/arch/m68k/conf/std.m68k
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/mac68k/conf/std.mac68k
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/mvme68k/conf/std.mvme68k
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/news68k/conf/std.news68k
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/next68k/conf/std.next68k
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/sun2/conf/std.sun2
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/sun3/conf/std.sun3
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/sun3/conf/std.sun3x
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/x68k/conf/std.x68k
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/amiga/conf/std.amiga
diff -u src/sys/arch/amiga/conf/std.amiga:1.21 src/sys/arch/amiga/conf/std.amiga:1.22
--- src/sys/arch/amiga/conf/std.amiga:1.21 Sun Dec 11 12:16:27 2005
+++ src/sys/arch/amiga/conf/std.amiga Sun Sep 19 02:09:27 2010
@@ -1,15 +1,13 @@
-# $NetBSD: std.amiga,v 1.21 2005/12/11 12:16:27 christos Exp $
+# $NetBSD: std.amiga,v 1.22 2010/09/19 02:09:27 tsutsui Exp $
# standard amiga information
machine amiga m68k
-include "conf/std" # MI standard options
+include "conf/std" # MI standard options
+include "arch/m68k/conf/std.m68k" # m68k standard options
mainbus0 at root
clock0 at mainbus0
kbd0 at mainbus0
zbus0 at mainbus0
-
-options EXEC_ELF32
-options EXEC_SCRIPT
Index: src/sys/arch/atari/conf/std.atari
diff -u src/sys/arch/atari/conf/std.atari:1.24 src/sys/arch/atari/conf/std.atari:1.25
--- src/sys/arch/atari/conf/std.atari:1.24 Sun Dec 11 12:16:54 2005
+++ src/sys/arch/atari/conf/std.atari Sun Sep 19 02:09:27 2010
@@ -1,15 +1,13 @@
-# $NetBSD: std.atari,v 1.24 2005/12/11 12:16:54 christos Exp $
+# $NetBSD: std.atari,v 1.25 2010/09/19 02:09:27 tsutsui Exp $
#
# standard atari information
#
machine atari m68k
-include "conf/std" # MI standard options
+include "conf/std" # MI standard options
+include "arch/m68k/conf/std.m68k" # m68k standard options
options _ATARIHW_ # Original Atari like mainboard hw.
-options EXEC_SCRIPT # Support #!
-options EXEC_ELF32 # 32-bit ELF executables
-
mainbus0 at root
clock0 at mainbus0 # system clock
Index: src/sys/arch/atari/conf/std.hades
diff -u src/sys/arch/atari/conf/std.hades:1.6 src/sys/arch/atari/conf/std.hades:1.7
--- src/sys/arch/atari/conf/std.hades:1.6 Sun Dec 11 12:16:54 2005
+++ src/sys/arch/atari/conf/std.hades Sun Sep 19 02:09:27 2010
@@ -1,15 +1,13 @@
-# $NetBSD: std.hades,v 1.6 2005/12/11 12:16:54 christos Exp $
+# $NetBSD: std.hades,v 1.7 2010/09/19 02:09:27 tsutsui Exp $
#
# standard Hades information
#
machine atari m68k
-include "conf/std" # MI standard options
+include "conf/std" # MI standard options
+include "arch/m68k/conf/std.m68k" # m68k standard options
options _ATARIHW_ # Original Atari like mainboard hw.
-options EXEC_SCRIPT # Support #!
-options EXEC_ELF32 # 32-bit ELF executables
-
mainbus0 at root
clock0 at mainbus0 # system clock
Index: src/sys/arch/atari/conf/std.milan
diff -u src/sys/arch/atari/conf/std.milan:1.5 src/sys/arch/atari/conf/std.milan:1.6
--- src/sys/arch/atari/conf/std.milan:1.5 Sun Dec 11 12:16:54 2005
+++ src/sys/arch/atari/conf/std.milan Sun Sep 19 02:09:27 2010
@@ -1,15 +1,13 @@
-# $NetBSD: std.milan,v 1.5 2005/12/11 12:16:54 christos Exp $
+# $NetBSD: std.milan,v 1.6 2010/09/19 02:09:27 tsutsui Exp $
#
# standard atari information
#
machine atari m68k
-include "conf/std" # MI standard options
+include "conf/std" # MI standard options
+include "arch/m68k/conf/std.m68k" # m68k standard options
options _MILANHW_
-options EXEC_SCRIPT # Support #!
-options EXEC_ELF32 # 32-bit ELF executables
-
mainbus0 at root
clock0 at mainbus0 # system clock
Index: src/sys/arch/cesfic/conf/std.cesfic
diff -u src/sys/arch/cesfic/conf/std.cesfic:1.4 src/sys/arch/cesfic/conf/std.cesfic:1.5
--- src/sys/arch/cesfic/conf/std.cesfic:1.4 Sun Dec 11 12:17:05 2005
+++ src/sys/arch/cesfic/conf/std.cesfic Sun Sep 19 02:09:27 2010
@@ -1,11 +1,10 @@
-# $NetBSD: std.cesfic,v 1.4 2005/12/11 12:17:05 christos Exp $
+# $NetBSD: std.cesfic,v 1.5 2010/09/19 02:09:27 tsutsui Exp $
#
# Options/devices that all cesfics should have
#
machine cesfic m68k
-include "conf/std" # MI standard options
+include "conf/std" # MI standard options
+include "arch/m68k/conf/std.m68k" # m68k standard options
-options EXEC_ELF32
options EXEC_AOUT # support for exec'ing a.out
-options EXEC_SCRIPT # support for #! scripts
Index: src/sys/arch/hp300/conf/std.hp300
diff -u src/sys/arch/hp300/conf/std.hp300:1.10 src/sys/arch/hp300/conf/std.hp300:1.11
--- src/sys/arch/hp300/conf/std.hp300:1.10 Sun Dec 11 12:17:13 2005
+++ src/sys/arch/hp300/conf/std.hp300 Sun Sep 19 02:09:28 2010
@@ -1,11 +1,10 @@
-# $NetBSD: std.hp300,v 1.10 2005/12/11 12:17:13 christos Exp $
+# $NetBSD: std.hp300,v 1.11 2010/09/19 02:09:28 tsutsui Exp $
#
# Options/devices that all hp300s should have
#
machine hp300 m68k
-include "conf/std" # MI standard options
+include "conf/std" # MI standard options
+include "arch/m68k/conf/std.m68k" # m68k standard options
options EXEC_AOUT # support for exec'ing a.out
-options EXEC_ELF32 # support for exec'ing ELF
-options EXEC_SCRIPT # support for #! scripts
Index: src/sys/arch/luna68k/conf/std.luna68k
diff -u src/sys/arch/luna68k/conf/std.luna68k:1.7 src/sys/arch/luna68k/conf/std.luna68k:1.8
--- src/sys/arch/luna68k/conf/std.luna68k:1.7 Sun Dec 11 12:17:52 2005
+++ src/sys/arch/luna68k/conf/std.luna68k Sun Sep 19 02:09:28 2010
@@ -1,7 +1,5 @@
-# $NetBSD: std.luna68k,v 1.7 2005/12/11 12:17:52 christos Exp $
+# $NetBSD: std.luna68k,v 1.8 2010/09/19 02:09:28 tsutsui Exp $
machine luna68k m68k
-include "conf/std" # MI standard options
-
-options EXEC_ELF32 # exec ELF binaries
-options EXEC_SCRIPT # exec #! scripts
+include "conf/std" # MI standard options
+include "arch/m68k/conf/std.m68k" # m68k standard options
Index: src/sys/arch/mac68k/conf/std.mac68k
diff -u src/sys/arch/mac68k/conf/std.mac68k:1.29 src/sys/arch/mac68k/conf/std.mac68k:1.30
--- src/sys/arch/mac68k/conf/std.mac68k:1.29 Sun Dec 11 12:18:02 2005
+++ src/sys/arch/mac68k/conf/std.mac68k Sun Sep 19 02:09:28 2010
@@ -1,12 +1,9 @@
-# $NetBSD: std.mac68k,v 1.29 2005/12/11 12:18:02 christos Exp $
+# $NetBSD: std.mac68k,v 1.30 2010/09/19 02:09:28 tsutsui Exp $
#
# "options" common to all mac68k kernel configs
machine mac68k m68k
-include "conf/std" # MI standard options
+include "conf/std" # MI standard options
+include "arch/m68k/conf/std.m68k" # m68k standard options
options HZ=60 # mac clock runs at 60hz
-
-# Executable support
-options EXEC_ELF32 # support for exec'ing ELF
-options EXEC_SCRIPT # support for #! scripts
Index: src/sys/arch/mvme68k/conf/std.mvme68k
diff -u src/sys/arch/mvme68k/conf/std.mvme68k:1.13 src/sys/arch/mvme68k/conf/std.mvme68k:1.14
--- src/sys/arch/mvme68k/conf/std.mvme68k:1.13 Sun Dec 11 12:18:17 2005
+++ src/sys/arch/mvme68k/conf/std.mvme68k Sun Sep 19 02:09:28 2010
@@ -1,15 +1,14 @@
-# $NetBSD: std.mvme68k,v 1.13 2005/12/11 12:18:17 christos Exp $
+# $NetBSD: std.mvme68k,v 1.14 2010/09/19 02:09:28 tsutsui Exp $
#
# Options/devices that all mvme68ks should have
#
machine mvme68k m68k
-include "conf/std" # MI standard options
+include "conf/std" # MI standard options
+include "arch/m68k/conf/std.m68k" # m68k standard options
timekeeper0 at mainbus0
options EXEC_AOUT # support for exec'ing a.out
-options EXEC_ELF32 # support for exec'ing Elf
-options EXEC_SCRIPT # support for #! scripts
options USE_ALT_LPT # use own lpt implementation
Index: src/sys/arch/news68k/conf/std.news68k
diff -u src/sys/arch/news68k/conf/std.news68k:1.6 src/sys/arch/news68k/conf/std.news68k:1.7
--- src/sys/arch/news68k/conf/std.news68k:1.6 Sun Dec 11 12:18:20 2005
+++ src/sys/arch/news68k/conf/std.news68k Sun Sep 19 02:09:28 2010
@@ -1,8 +1,7 @@
-# $NetBSD: std.news68k,v 1.6 2005/12/11 12:18:20 christos Exp $
+# $NetBSD: std.news68k,v 1.7 2010/09/19 02:09:28 tsutsui Exp $
machine news68k m68k
-include "conf/std" # MI standard options
+include "conf/std" # MI standard options
+include "arch/m68k/conf/std.m68k" # m68k standard options
options EXEC_AOUT # exec a.out binaries
-options EXEC_ELF32 # exec ELF binaries
-options EXEC_SCRIPT # exec #! scripts
Index: src/sys/arch/next68k/conf/std.next68k
diff -u src/sys/arch/next68k/conf/std.next68k:1.11 src/sys/arch/next68k/conf/std.next68k:1.12
--- src/sys/arch/next68k/conf/std.next68k:1.11 Sun Dec 11 12:18:25 2005
+++ src/sys/arch/next68k/conf/std.next68k Sun Sep 19 02:09:29 2010
@@ -1,9 +1,6 @@
-# $NetBSD: std.next68k,v 1.11 2005/12/11 12:18:25 christos Exp $
+# $NetBSD: std.next68k,v 1.12 2010/09/19 02:09:29 tsutsui Exp $
# Standard information for next68k
machine next68k m68k
-include "conf/std" # MI standard options
-
-# Standard defines
-options EXEC_ELF32
-options EXEC_SCRIPT
+include "conf/std" # MI standard options
+include "arch/m68k/conf/std.m68k" # m68k standard options
Index: src/sys/arch/sun2/conf/std.sun2
diff -u src/sys/arch/sun2/conf/std.sun2:1.6 src/sys/arch/sun2/conf/std.sun2:1.7
--- src/sys/arch/sun2/conf/std.sun2:1.6 Sun Oct 1 03:53:27 2006
+++ src/sys/arch/sun2/conf/std.sun2 Sun Sep 19 02:09:29 2010
@@ -1,11 +1,9 @@
-# $NetBSD: std.sun2,v 1.6 2006/10/01 03:53:27 tsutsui Exp $
+# $NetBSD: std.sun2,v 1.7 2010/09/19 02:09:29 tsutsui Exp $
# Standard information for Sun2 machines.
machine sun2 m68k sun68k
-include "conf/std" # MI standard options
+include "conf/std" # MI standard options
+include "arch/m68k/conf/std.m68k" # m68k standard options
# XXX temporary option until sun3 port migrates to all sun68k stuff
options _SUN2_
-
-# Standard defines
-options EXEC_ELF32, EXEC_SCRIPT
Index: src/sys/arch/sun3/conf/std.sun3
diff -u src/sys/arch/sun3/conf/std.sun3:1.33 src/sys/arch/sun3/conf/std.sun3:1.34
--- src/sys/arch/sun3/conf/std.sun3:1.33 Sun Oct 1 03:53:27 2006
+++ src/sys/arch/sun3/conf/std.sun3 Sun Sep 19 02:09:29 2010
@@ -1,8 +1,9 @@
-# $NetBSD: std.sun3,v 1.33 2006/10/01 03:53:27 tsutsui Exp $
+# $NetBSD: std.sun3,v 1.34 2010/09/19 02:09:29 tsutsui Exp $
# Standard information for Sun3 machines.
machine sun3 m68k sun68k
-include "conf/std" # MI standard options
+include "conf/std" # MI standard options
+include "arch/m68k/conf/std.m68k" # m68k standard options
# Machine type to be supported by this kernel. Note:
# The SUN3 and SUN3X options are mutually exclusive!
@@ -13,6 +14,3 @@
# The root node (required)
mainbus0 at root
-
-# Standard defines
-options EXEC_ELF32, EXEC_SCRIPT
Index: src/sys/arch/sun3/conf/std.sun3x
diff -u src/sys/arch/sun3/conf/std.sun3x:1.12 src/sys/arch/sun3/conf/std.sun3x:1.13
--- src/sys/arch/sun3/conf/std.sun3x:1.12 Sun Oct 1 03:53:27 2006
+++ src/sys/arch/sun3/conf/std.sun3x Sun Sep 19 02:09:29 2010
@@ -1,8 +1,9 @@
-# $NetBSD: std.sun3x,v 1.12 2006/10/01 03:53:27 tsutsui Exp $
+# $NetBSD: std.sun3x,v 1.13 2010/09/19 02:09:29 tsutsui Exp $
# Standard information for Sun3X machines.
machine sun3 m68k sun68k
-include "conf/std" # MI standard options
+include "conf/std" # MI standard options
+include "arch/m68k/conf/std.m68k" # m68k standard options
# Machine type to be supported by this kernel. Note:
# The SUN3 and SUN3X options are mutually exclusive!
@@ -14,6 +15,3 @@
# The root node (required)
mainbus0 at root
-
-# Standard defines
-options EXEC_ELF32, EXEC_SCRIPT
Index: src/sys/arch/x68k/conf/std.x68k
diff -u src/sys/arch/x68k/conf/std.x68k:1.12 src/sys/arch/x68k/conf/std.x68k:1.13
--- src/sys/arch/x68k/conf/std.x68k:1.12 Sun Dec 11 12:19:37 2005
+++ src/sys/arch/x68k/conf/std.x68k Sun Sep 19 02:09:29 2010
@@ -1,15 +1,14 @@
-# $NetBSD: std.x68k,v 1.12 2005/12/11 12:19:37 christos Exp $
+# $NetBSD: std.x68k,v 1.13 2010/09/19 02:09:29 tsutsui Exp $
#
# Mandatory NetBSD/x68k kernel options.
#
-machine x68k m68k # Machine architecture; required by config(8)
-include "conf/std" # MI standard options
+machine x68k m68k # Machine architecture; required by config(1)
+include "conf/std" # MI standard options
+include "arch/m68k/conf/std.m68k" # m68k standard options
-options EXEC_ELF32 # execve(2) support for ELF binaries
options EXEC_AOUT # execve(2) support for a.out binaries
-options EXEC_SCRIPT # execve(2) support for scripts
## Fundamental devices
Added files:
Index: src/sys/arch/m68k/conf/std.m68k
diff -u /dev/null src/sys/arch/m68k/conf/std.m68k:1.1
--- /dev/null Sun Sep 19 02:09:30 2010
+++ src/sys/arch/m68k/conf/std.m68k Sun Sep 19 02:09:28 2010
@@ -0,0 +1,8 @@
+# $NetBSD: std.m68k,v 1.1 2010/09/19 02:09:28 tsutsui Exp $
+#
+# standard, required NetBSD/m68k options
+
+options EXEC_ELF32 # exec ELF binaries
+options EXEC_SCRIPT # exec #! scripts
+
+options CPU_IN_CKSUM # use MD optimized cpu_in_cksum()
