[src/trunk]: src/sys/arch/mac68k/conf Update the GENERIC and GENERICSBC kerne...

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

details:   https://anonhg.NetBSD.org/src/rev/d074e2482ced
branches:  trunk
changeset: 521802:d074e2482ced
user:      fredb <fredb%NetBSD.org@localhost>
date:      Wed Feb 06 00:45:53 2002 +0000

description:
Update the GENERIC and GENERICSBC kernels to conform to current fashion:

- - Disable `options DIAGNOSTIC' by default, as the checks are reported to
    be not really cheap.
- - Add `options COMPAT_AOUT_M68K', commented out, in preparation for ELF.
- - Remove `options EXEC_ELF32' from the kernel config. You can't just
    build an ELF kernel -- you need to update your toolchain, and then,
    once you go ELF, it's not an option, so it needs to go in std.mac68k,
    as on the other m68k ports.
- - Comment out `options COMPAT_SUNOS'. This hasn't been reported to work
    for a long time, so it's not very useful in GENERIC.
- - Enable `options IPFILTER_LOG', to go along with the `options GATEWAY'
    and `pseudo-device ipfilter' motif.

diffstat:

 sys/arch/mac68k/conf/GENERIC    |  17 ++++++++++-------
 sys/arch/mac68k/conf/GENERICSBC |  19 +++++++++++--------
 2 files changed, 21 insertions(+), 15 deletions(-)

diffs (108 lines):

diff -r 430a595bca69 -r d074e2482ced sys/arch/mac68k/conf/GENERIC
--- a/sys/arch/mac68k/conf/GENERIC      Tue Feb 05 23:29:43 2002 +0000
+++ b/sys/arch/mac68k/conf/GENERIC      Wed Feb 06 00:45:53 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.120 2002/01/27 13:23:19 jdolecek Exp $
+# $NetBSD: GENERIC,v 1.121 2002/02/06 00:45:53 fredb Exp $
 #
 # GENERIC machine description file
 # 
@@ -20,7 +20,7 @@
 
 include                "arch/mac68k/conf/std.mac68k"
 
-#ident                 "GENERIC-$Revision: 1.120 $"
+#ident                 "GENERIC-$Revision: 1.121 $"
 
 maxusers       16              # estimated number of users
 
@@ -57,7 +57,7 @@
 #options       PIPE_SOCKETPAIR # smaller, but slower pipe(2)
 
 # Diagnostic/debugging support options
-options        DIAGNOSTIC      # cheap kernel consistency checks
+#options       DIAGNOSTIC      # cheap kernel consistency checks
 #options       DEBUG           # expensive debugging checks/support
 options        KMEMSTATS       # kernel memory statistics (vmstat -m)
 options        DDB                     # in-kernel debugger
@@ -78,11 +78,13 @@
 options        COMPAT_43       # and 4.3BSD
 #options       TCP_COMPAT_42   # 4.2BSD TCP/IP bug compat. Not recommended.
 
-options        COMPAT_SUNOS    # compatibility with SunOS 4.x binaries
-#options       COMPAT_SVR4     # compatibility with SVR4 binaries
+# The following is needed to run pre-NetBSD 1.6 binaries under ELF.
+#options       COMPAT_AOUT_M68K # compatibility with NetBSD/m68k a.out
+
+#options       COMPAT_LINUX    # compatibility with Linux/m68k binaries
 #options       COMPAT_M68K4K   # compatibility with NetBSD/m68k4k binaries
-#options       COMPAT_LINUX    # compatibility with Linux/m68k binaries
-#options       EXEC_ELF32      # 32-bit ELF executables (Linux, SVR4)
+#options       COMPAT_SUNOS    # compatibility with SunOS 4.x binaries
+#options       COMPAT_SVR4     # compatibility with SVR4 binaries
 
 # File systems
 file-system    FFS             # UFS
@@ -128,6 +130,7 @@
 options        PPP_DEFLATE     # Deflate compression support for PPP
 options        PPP_FILTER      # Active filter support for PPP (requires bpf)
 options        PFIL_HOOKS      # pfil(9) packet filter hooks
+options        IPFILTER_LOG    # ipmon(8) log support
 #options       TCP_DEBUG       # Record last TCP_NDEBUG packets with SO_DEBUG
 
 # These options enable verbose messages for several subsystems.
diff -r 430a595bca69 -r d074e2482ced sys/arch/mac68k/conf/GENERICSBC
--- a/sys/arch/mac68k/conf/GENERICSBC   Tue Feb 05 23:29:43 2002 +0000
+++ b/sys/arch/mac68k/conf/GENERICSBC   Wed Feb 06 00:45:53 2002 +0000
@@ -1,10 +1,10 @@
-#      $NetBSD: GENERICSBC,v 1.11 2002/01/27 13:23:20 jdolecek Exp $
+#      $NetBSD: GENERICSBC,v 1.12 2002/02/06 00:45:54 fredb Exp $
 #
 # GENERICSBC
 
 include        "arch/mac68k/conf/std.mac68k"
 
-#ident                 "GENERICSBC-$Revision: 1.11 $"
+#ident                 "GENERICSBC-$Revision: 1.12 $"
 
 maxusers       16              # estimated number of users
 
@@ -41,10 +41,10 @@
 #options       PIPE_SOCKETPAIR # smaller, but slower pipe(2)
 
 # Diagnostic/debugging support options
-options        DIAGNOSTIC      # cheap kernel consistency checks
+#options       DIAGNOSTIC      # cheap kernel consistency checks
 #options       DEBUG           # expensive debugging checks/support
 options        KMEMSTATS       # kernel memory statistics (vmstat -m)
-options        DDB             # in-kernel debugger
+options        DDB                     # in-kernel debugger
 #options       DDB_HISTORY_SIZE=100    # enable history editing in DDB
 #options       KGDB                    # remote debugger
 #options       KGDB_DEV=0xc01          # kgdb device number (dev_t)
@@ -62,11 +62,13 @@
 options        COMPAT_43       # and 4.3BSD
 #options       TCP_COMPAT_42   # 4.2BSD TCP/IP bug compat. Not recommended.
 
-options        COMPAT_SUNOS    # compatibility with SunOS 4.x binaries
-#options       COMPAT_SVR4     # compatibility with SVR4 binaries
+# The following is needed to run pre-NetBSD 1.6 binaries under ELF.
+#options       COMPAT_AOUT_M68K # compatibility with NetBSD/m68k a.out
+
+#options       COMPAT_LINUX    # compatibility with Linux/m68k binaries
 #options       COMPAT_M68K4K   # compatibility with NetBSD/m68k4k binaries
-#options       COMPAT_LINUX    # compatibility with Linux/m68k binaries
-#options       EXEC_ELF32      # 32-bit ELF executables (Linux, SVR4)
+#options       COMPAT_SUNOS    # compatibility with SunOS 4.x binaries
+#options       COMPAT_SVR4     # compatibility with SVR4 binaries
 
 # File systems
 file-system    FFS             # UFS
@@ -112,6 +114,7 @@
 options        PPP_DEFLATE     # Deflate compression support for PPP
 options        PPP_FILTER      # Active filter support for PPP (requires bpf)
 options        PFIL_HOOKS      # pfil(9) packet filter hooks
+options        IPFILTER_LOG    # ipmon(8) log support
 #options       TCP_DEBUG       # Record last TCP_NDEBUG packets with SO_DEBUG
 
 # These options enable verbose messages for several subsystems.