Module Name: src
Committed By: tsutsui
Date: Sat Jul 26 17:34:31 UTC 2014
Modified Files:
src/sys/arch/sun2/conf: DISKLESS FOURMEG INSTALL
Log Message:
Comment out options and devices to sync GENERIC rev 1.90.
To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 src/sys/arch/sun2/conf/DISKLESS
cvs rdiff -u -r1.55 -r1.56 src/sys/arch/sun2/conf/FOURMEG
cvs rdiff -u -r1.48 -r1.49 src/sys/arch/sun2/conf/INSTALL
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/sun2/conf/DISKLESS
diff -u src/sys/arch/sun2/conf/DISKLESS:1.51 src/sys/arch/sun2/conf/DISKLESS:1.52
--- src/sys/arch/sun2/conf/DISKLESS:1.51 Sun Jun 30 21:38:59 2013
+++ src/sys/arch/sun2/conf/DISKLESS Sat Jul 26 17:34:31 2014
@@ -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 @@ include "arch/sun2/conf/std.sun2"
#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 @@ makeoptions COPTS="-Os" # optimize for s
#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 SYSVMSG # System V message que
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 @@ options DDB
# 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 @@ pseudo-device pty # pseudo-terminals
#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
Index: src/sys/arch/sun2/conf/FOURMEG
diff -u src/sys/arch/sun2/conf/FOURMEG:1.55 src/sys/arch/sun2/conf/FOURMEG:1.56
--- src/sys/arch/sun2/conf/FOURMEG:1.55 Sun Jun 30 21:38:59 2013
+++ src/sys/arch/sun2/conf/FOURMEG Sat Jul 26 17:34:31 2014
@@ -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 @@ include "arch/sun2/conf/std.sun2"
#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_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
@@ -178,10 +180,10 @@ options SCSI_OLD_NOINQUIRY
## 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
Index: src/sys/arch/sun2/conf/INSTALL
diff -u src/sys/arch/sun2/conf/INSTALL:1.48 src/sys/arch/sun2/conf/INSTALL:1.49
--- src/sys/arch/sun2/conf/INSTALL:1.48 Sun Jun 30 21:38:59 2013
+++ src/sys/arch/sun2/conf/INSTALL Sat Jul 26 17:34:31 2014
@@ -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 @@ include "arch/sun2/conf/std.sun2"
#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 PIPE_SOCKETPAIR # smaller, but
#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 USERCONF # userconf(4) support
#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 @@ options SCSI_OLD_NOINQUIRY
## 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
