Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch - add m68k/conf/std.m68k, which includes common sta...



details:   https://anonhg.NetBSD.org/src/rev/1293c56f134e
branches:  trunk
changeset: 757720:1293c56f134e
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Sun Sep 19 02:09:27 2010 +0000

description:
- 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}

diffstat:

 sys/arch/amiga/conf/std.amiga     |  8 +++-----
 sys/arch/atari/conf/std.atari     |  8 +++-----
 sys/arch/atari/conf/std.hades     |  8 +++-----
 sys/arch/atari/conf/std.milan     |  8 +++-----
 sys/arch/cesfic/conf/std.cesfic   |  7 +++----
 sys/arch/hp300/conf/std.hp300     |  7 +++----
 sys/arch/luna68k/conf/std.luna68k |  8 +++-----
 sys/arch/m68k/conf/std.m68k       |  8 ++++++++
 sys/arch/mac68k/conf/std.mac68k   |  9 +++------
 sys/arch/mvme68k/conf/std.mvme68k |  7 +++----
 sys/arch/news68k/conf/std.news68k |  7 +++----
 sys/arch/next68k/conf/std.next68k |  9 +++------
 sys/arch/sun2/conf/std.sun2       |  8 +++-----
 sys/arch/sun3/conf/std.sun3       |  8 +++-----
 sys/arch/sun3/conf/std.sun3x      |  8 +++-----
 sys/arch/x68k/conf/std.x68k       |  9 ++++-----
 16 files changed, 54 insertions(+), 73 deletions(-)

diffs (truncated from 307 to 300 lines):

diff -r 57481939f8e5 -r 1293c56f134e sys/arch/amiga/conf/std.amiga
--- a/sys/arch/amiga/conf/std.amiga     Sun Sep 19 02:07:00 2010 +0000
+++ b/sys/arch/amiga/conf/std.amiga     Sun Sep 19 02:09:27 2010 +0000
@@ -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
diff -r 57481939f8e5 -r 1293c56f134e sys/arch/atari/conf/std.atari
--- a/sys/arch/atari/conf/std.atari     Sun Sep 19 02:07:00 2010 +0000
+++ b/sys/arch/atari/conf/std.atari     Sun Sep 19 02:09:27 2010 +0000
@@ -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
diff -r 57481939f8e5 -r 1293c56f134e sys/arch/atari/conf/std.hades
--- a/sys/arch/atari/conf/std.hades     Sun Sep 19 02:07:00 2010 +0000
+++ b/sys/arch/atari/conf/std.hades     Sun Sep 19 02:09:27 2010 +0000
@@ -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
diff -r 57481939f8e5 -r 1293c56f134e sys/arch/atari/conf/std.milan
--- a/sys/arch/atari/conf/std.milan     Sun Sep 19 02:07:00 2010 +0000
+++ b/sys/arch/atari/conf/std.milan     Sun Sep 19 02:09:27 2010 +0000
@@ -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
diff -r 57481939f8e5 -r 1293c56f134e sys/arch/cesfic/conf/std.cesfic
--- a/sys/arch/cesfic/conf/std.cesfic   Sun Sep 19 02:07:00 2010 +0000
+++ b/sys/arch/cesfic/conf/std.cesfic   Sun Sep 19 02:09:27 2010 +0000
@@ -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
diff -r 57481939f8e5 -r 1293c56f134e sys/arch/hp300/conf/std.hp300
--- a/sys/arch/hp300/conf/std.hp300     Sun Sep 19 02:07:00 2010 +0000
+++ b/sys/arch/hp300/conf/std.hp300     Sun Sep 19 02:09:27 2010 +0000
@@ -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
diff -r 57481939f8e5 -r 1293c56f134e sys/arch/luna68k/conf/std.luna68k
--- a/sys/arch/luna68k/conf/std.luna68k Sun Sep 19 02:07:00 2010 +0000
+++ b/sys/arch/luna68k/conf/std.luna68k Sun Sep 19 02:09:27 2010 +0000
@@ -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
diff -r 57481939f8e5 -r 1293c56f134e sys/arch/m68k/conf/std.m68k
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/m68k/conf/std.m68k       Sun Sep 19 02:09:27 2010 +0000
@@ -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()
diff -r 57481939f8e5 -r 1293c56f134e sys/arch/mac68k/conf/std.mac68k
--- a/sys/arch/mac68k/conf/std.mac68k   Sun Sep 19 02:07:00 2010 +0000
+++ b/sys/arch/mac68k/conf/std.mac68k   Sun Sep 19 02:09:27 2010 +0000
@@ -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
diff -r 57481939f8e5 -r 1293c56f134e sys/arch/mvme68k/conf/std.mvme68k
--- a/sys/arch/mvme68k/conf/std.mvme68k Sun Sep 19 02:07:00 2010 +0000
+++ b/sys/arch/mvme68k/conf/std.mvme68k Sun Sep 19 02:09:27 2010 +0000
@@ -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
diff -r 57481939f8e5 -r 1293c56f134e sys/arch/news68k/conf/std.news68k
--- a/sys/arch/news68k/conf/std.news68k Sun Sep 19 02:07:00 2010 +0000
+++ b/sys/arch/news68k/conf/std.news68k Sun Sep 19 02:09:27 2010 +0000
@@ -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
diff -r 57481939f8e5 -r 1293c56f134e sys/arch/next68k/conf/std.next68k
--- a/sys/arch/next68k/conf/std.next68k Sun Sep 19 02:07:00 2010 +0000
+++ b/sys/arch/next68k/conf/std.next68k Sun Sep 19 02:09:27 2010 +0000
@@ -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
diff -r 57481939f8e5 -r 1293c56f134e sys/arch/sun2/conf/std.sun2
--- a/sys/arch/sun2/conf/std.sun2       Sun Sep 19 02:07:00 2010 +0000
+++ b/sys/arch/sun2/conf/std.sun2       Sun Sep 19 02:09:27 2010 +0000
@@ -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
diff -r 57481939f8e5 -r 1293c56f134e sys/arch/sun3/conf/std.sun3
--- a/sys/arch/sun3/conf/std.sun3       Sun Sep 19 02:07:00 2010 +0000
+++ b/sys/arch/sun3/conf/std.sun3       Sun Sep 19 02:09:27 2010 +0000
@@ -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
diff -r 57481939f8e5 -r 1293c56f134e sys/arch/sun3/conf/std.sun3x
--- a/sys/arch/sun3/conf/std.sun3x      Sun Sep 19 02:07:00 2010 +0000
+++ b/sys/arch/sun3/conf/std.sun3x      Sun Sep 19 02:09:27 2010 +0000
@@ -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
diff -r 57481939f8e5 -r 1293c56f134e sys/arch/x68k/conf/std.x68k
--- a/sys/arch/x68k/conf/std.x68k       Sun Sep 19 02:07:00 2010 +0000
+++ b/sys/arch/x68k/conf/std.x68k       Sun Sep 19 02:09:27 2010 +0000
@@ -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



Home | Main Index | Thread Index | Old Index