Source-Changes-HG archive

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

[src/trunk]: src/sys/arch/sun2/conf Comment out options and devices to sync G...



details:   https://anonhg.NetBSD.org/src/rev/6ae3594cfe0f
branches:  trunk
changeset: 797758:6ae3594cfe0f
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Sat Jul 26 17:34:31 2014 +0000

description:
Comment out options and devices to sync GENERIC rev 1.90.

diffstat:

 sys/arch/sun2/conf/DISKLESS |  22 ++++++++++++----------
 sys/arch/sun2/conf/FOURMEG  |  14 ++++++++------
 sys/arch/sun2/conf/INSTALL  |  14 +++++++-------
 3 files changed, 27 insertions(+), 23 deletions(-)

diffs (171 lines):

diff -r a68581411205 -r 6ae3594cfe0f sys/arch/sun2/conf/DISKLESS
--- a/sys/arch/sun2/conf/DISKLESS       Sat Jul 26 17:32:07 2014 +0000
+++ b/sys/arch/sun2/conf/DISKLESS       Sat Jul 26 17:34:31 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: DISKLESS,v 1.51 2013/06/30 21:38:59 rmind Exp $
+# $NetBSD: DISKLESS,v 1.52 2014/07/26 17:34:31 tsutsui Exp $
 
 # DISKLESS Sun2 (2/120, 2/170, 2/50, ...)
 # Supports root on: ie0, ec0
@@ -7,7 +7,7 @@
 
 #options       INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "DISKLESS-$Revision: 1.51 $"
+#ident                 "DISKLESS-$Revision: 1.52 $"
 
 makeoptions    COPTS="-Os"     # optimize for size
 
@@ -15,7 +15,7 @@
 #options       FPU_EMULATE
 
 # Needs to be set per system.  i.e change these as you see fit
-maxusers       8
+maxusers       4
 
 # Standard system options
 options        KTRACE          # system call tracing
@@ -23,7 +23,7 @@
 options        SYSVSEM         # System V semaphores
 options        SYSVSHM         # System V shared memory
 #options       INSECURE        # disable kernel security level
-options        USERCONF        # userconf(4) support
+#options       USERCONF        # userconf(4) support
 #options       PIPE_SOCKETPAIR # smaller, but slower pipe(2)
 #options       SYSCTL_INCLUDE_DESCR    # Include sysctl descriptions in kernel
 
@@ -45,26 +45,28 @@
 
 # Compatibility options
 #options       COMPAT_SUNOS    # can run SunOS 4.1.1 executables
-options        COMPAT_43       # and 4.3BSD and ...
+#options       COMPAT_43       # and 4.3BSD and ...
 options        COMPAT_16       # NetBSD 1.6
 options        COMPAT_20       # NetBSD 2.0
 options        COMPAT_30       # NetBSD 3.0
 options        COMPAT_40       # NetBSD 4.0 compatibility.
+options        COMPAT_50       # NetBSD 5.0 compatibility.
+options        COMPAT_60       # NetBSD 6.0 compatibility.
 #options       COMPAT_AOUT_M68K # support for NetBSD a.out executables
 #options       TCP_COMPAT_42   # 4.2BSD TCP/IP bug compat. Not recommended.
-options        EXEC_AOUT       # support for a.out executables
+#options       EXEC_AOUT       # support for a.out executables
 options                COMPAT_BSDPTY   # /dev/[pt]ty?? ptys.
 
 # Filesystem options
 #file-system   FFS             # Berkeley Fast Filesystem
 file-system    NFS             # Sun NFS client support
 #file-system   CD9660          # ISO 9660 + Rock Ridge file system
-file-system    FDESC           # /dev/fd/*
+#file-system   FDESC           # /dev/fd/*
 file-system    KERNFS          # /kern
 file-system    NULLFS          # loopback file system
-file-system    OVERLAY         # overlay file system
+#file-system   OVERLAY         # overlay file system
 #file-system   PROCFS          # /proc
-file-system    UNION           # union file system
+#file-system   UNION           # union file system
 file-system    MFS             # memory-based filesystem
 file-system    PTYFS           # /dev/pts/N support
 
@@ -229,4 +231,4 @@
 #options       RAID_AUTOCONFIG         # auto-configuration of RAID components
 #pseudo-device fss                     # file system snapshot device
 
-pseudo-device  clockctl                # user control of clock subsystem
+#pseudo-device clockctl                # user control of clock subsystem
diff -r a68581411205 -r 6ae3594cfe0f sys/arch/sun2/conf/FOURMEG
--- a/sys/arch/sun2/conf/FOURMEG        Sat Jul 26 17:32:07 2014 +0000
+++ b/sys/arch/sun2/conf/FOURMEG        Sat Jul 26 17:34:31 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: FOURMEG,v 1.55 2013/06/30 21:38:59 rmind Exp $
+# $NetBSD: FOURMEG,v 1.56 2014/07/26 17:34:31 tsutsui Exp $
 
 # FOURMEG Sun2 (2/120, 2/170, 2/50, ...)
 # Supports root on: ie0, sd*, ...
@@ -7,7 +7,7 @@
 
 #options       INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "FOURMEG-$Revision: 1.55 $"
+#ident                 "FOURMEG-$Revision: 1.56 $"
 
 makeoptions    COPTS="-Os"     # optimize for size
 
@@ -50,9 +50,11 @@
 options        COMPAT_20       # NetBSD 2.0
 options        COMPAT_30       # NetBSD 3.0
 options        COMPAT_40       # NetBSD 4.0 compatibility.
+options        COMPAT_50       # NetBSD 5.0 compatibility.
+options        COMPAT_60       # NetBSD 6.0 compatibility.
 #options       COMPAT_AOUT_M68K # support for NetBSD a.out executables
 #options       TCP_COMPAT_42   # 4.2BSD TCP/IP bug compat. Not recommended.
-options        EXEC_AOUT       # support for a.out executables
+#options       EXEC_AOUT       # support for a.out executables
 options                COMPAT_BSDPTY   # /dev/[pt]ty?? ptys.
 
 # Filesystem options
@@ -178,10 +180,10 @@
 
 ## Xylogics 450 or 451 Multibus/VME SMD disk controllers and disks.
 #xyc0  at mbio0 addr 0xee40 ipl 2
-xyc0   at vme0 addr 0xee40 irq 2 vect 0x48
+#xyc0  at vme0 addr 0xee40 irq 2 vect 0x48
 #xyc1  at mbio0 addr 0xee48 ipl 2
-xyc1   at vme0 addr 0xee48 irq 2 vect 0x49
-xy*    at xyc? drive ?
+#xyc1  at vme0 addr 0xee48 irq 2 vect 0x49
+#xy*   at xyc? drive ?
 
 ## Memory-disk device.
 pseudo-device  md              
diff -r a68581411205 -r 6ae3594cfe0f sys/arch/sun2/conf/INSTALL
--- a/sys/arch/sun2/conf/INSTALL        Sat Jul 26 17:32:07 2014 +0000
+++ b/sys/arch/sun2/conf/INSTALL        Sat Jul 26 17:34:31 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.48 2013/06/30 21:38:59 rmind Exp $
+# $NetBSD: INSTALL,v 1.49 2014/07/26 17:34:31 tsutsui Exp $
 
 # INSTALL Sun2 (2/120, 2/170, 2/50, ...)
 
@@ -6,7 +6,7 @@
 
 #options       INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "INSTALL-$Revision: 1.48 $"
+#ident                 "INSTALL-$Revision: 1.49 $"
 
 makeoptions    COPTS="-Os"     # optimize for size
 
@@ -36,7 +36,7 @@
 #options       DDB_HISTORY_SIZE=100    # enable history editing in DDB
 #options       DEBUG           # kernel debugging code
 #options       DIAGNOSTIC      # extra kernel sanity checking
-options        USERCONF        # userconf(4) support
+#options       USERCONF        # userconf(4) support
 #options       KMEMSTATS       # kernel memory statistics (vmstat -m)
 #options       PMAP_DEBUG
 #options       SCSIDEBUG
@@ -47,7 +47,7 @@
 #options       COMPAT_43       # and 4.3BSD and ...
 #options       COMPAT_AOUT_M68K # support for NetBSD a.out executables
 #options       TCP_COMPAT_42   # 4.2BSD TCP/IP bug compat. Not recommended.
-options        EXEC_AOUT       # support for a.out executables
+#options       EXEC_AOUT       # support for a.out executables
 options                COMPAT_BSDPTY   # /dev/[pt]ty?? ptys.
 
 # Filesystem options
@@ -173,10 +173,10 @@
 
 ## Xylogics 450 or 451 Multibus/VME SMD disk controllers and disks.
 #xyc0  at mbio0 addr 0xee40 ipl 2
-xyc0   at vme0 addr 0xee40 irq 2 vect 0x48
+#xyc0  at vme0 addr 0xee40 irq 2 vect 0x48
 #xyc1  at mbio0 addr 0xee48 ipl 2
-xyc1   at vme0 addr 0xee48 irq 2 vect 0x49
-xy*    at xyc? drive ?
+#xyc1  at vme0 addr 0xee48 irq 2 vect 0x49
+#xy*   at xyc? drive ?
 
 ## Memory-disk device.
 #pseudo-device md              



Home | Main Index | Thread Index | Old Index