Module Name: src
Committed By: nakayama
Date: Wed May 25 20:00:50 UTC 2016
Modified Files:
src/sys/arch/sparc64/conf: GENERIC GENERIC.DEBUG GENERIC.UP GENERIC32
GENERIC32.UP INSTALL MODULAR NONPLUS NONPLUS64
Log Message:
tabify, fix indent and remove trailing whitespace.
To generate a diff of this commit:
cvs rdiff -u -r1.186 -r1.187 src/sys/arch/sparc64/conf/GENERIC
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/sparc64/conf/GENERIC.DEBUG
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/sparc64/conf/GENERIC.UP \
src/sys/arch/sparc64/conf/GENERIC32.UP
cvs rdiff -u -r1.140 -r1.141 src/sys/arch/sparc64/conf/GENERIC32
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/sparc64/conf/INSTALL
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/sparc64/conf/MODULAR
cvs rdiff -u -r1.58 -r1.59 src/sys/arch/sparc64/conf/NONPLUS
cvs rdiff -u -r1.46 -r1.47 src/sys/arch/sparc64/conf/NONPLUS64
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/sparc64/conf/GENERIC
diff -u src/sys/arch/sparc64/conf/GENERIC:1.186 src/sys/arch/sparc64/conf/GENERIC:1.187
--- src/sys/arch/sparc64/conf/GENERIC:1.186 Tue May 24 13:57:26 2016
+++ src/sys/arch/sparc64/conf/GENERIC Wed May 25 20:00:50 2016
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.186 2016/05/24 13:57:26 martin Exp $
+# $NetBSD: GENERIC,v 1.187 2016/05/25 20:00:50 nakayama Exp $
#
# GENERIC machine description file
#
@@ -18,11 +18,11 @@
# of each device driver in this file see the section 4 man page for the
# device.
-include "arch/sparc64/conf/std.sparc64"
+include "arch/sparc64/conf/std.sparc64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.186 $"
+#ident "GENERIC-$Revision: 1.187 $"
maxusers 64
@@ -56,14 +56,14 @@ options SYSVMSG # System V message que
options SYSVSEM # System V semaphores
options SYSVSHM # System V shared memory
-options MODULAR # new style module(7) framework
-options MODULAR_DEFAULT_AUTOLOAD
+options MODULAR # new style module(7) framework
+options MODULAR_DEFAULT_AUTOLOAD
options USERCONF # userconf(4) support
#options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel
-# Enable experimental buffer queue strategy for better responsiveness under
+# Enable experimental buffer queue strategy for better responsiveness under
# high disk I/O load. Use it with caution - it's not proven to be stable yet.
#options BUFQ_READPRIO
#options BUFQ_PRIOCSCAN
@@ -156,14 +156,14 @@ options EXEC_AOUT # execve(2) support f
options EXEC_ELF32 # Exec module for SunOS 5.x binaries.
#options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended.
-options COMPAT_BSDPTY # /dev/[pt]ty?? ptys.
+options COMPAT_BSDPTY # /dev/[pt]ty?? ptys.
## File systems. You probably need at least one of FFS or NFS.
file-system FFS # Berkeley Fast Filesystem
file-system NFS # Sun NFS-compatible filesystem client
file-system KERNFS # kernel data-structure filesystem
file-system NULLFS # NULL layered filesystem
-file-system OVERLAY # overlay file system
+file-system OVERLAY # overlay file system
file-system MFS # memory-based filesystem
file-system FDESC # user file descriptor filesystem
file-system UMAPFS # uid/gid remapping filesystem
@@ -201,7 +201,7 @@ options NTP # Network Time Protocol in
#options PPS_SYNC # Add serial line synchronization for NTP
options IPFILTER_LOG # Add ipmon(8) logging for ipfilter device
options IPFILTER_LOOKUP # ippool(8) support
-options IPFILTER_COMPAT # Compat for IP-Filter
+options IPFILTER_COMPAT # Compat for IP-Filter
#options IPFILTER_DEFAULT_BLOCK # block all packets by default
options PPP_BSDCOMP # Add BSD compression to ppp device
options PPP_DEFLATE # Add deflate (libz) compression to ppp device
@@ -225,13 +225,13 @@ options PPP_FILTER # Add active filters
#### Main bus and CPUs .. all systems.
mainbus0 at root
options MULTIPROCESSOR # include multiprocessor support
-cpu* at mainbus0 # declare additional CPUs
+cpu* at mainbus0 # declare additional CPUs
#### Bus types found on SPARC systems.
sbus* at mainbus0 # SBus-based systems
-psycho* at mainbus0 # PCI-based systems
-schizo* at mainbus?
+psycho* at mainbus0 # PCI-based systems
+schizo* at mainbus?
pyro* at mainbus?
vpci* at mainbus0
central* at mainbus?
@@ -289,7 +289,7 @@ ms0 at zstty?
## The SAB82532 controller has two serial ports
sab* at ebus? # ttya/ttyb
-sabtty* at sab? channel ?
+sabtty* at sab? channel ?
## Part of a PC87332VLJ
com* at ebus? # `com' driver for `su'
@@ -297,12 +297,12 @@ kbd0 at com? # keyboard
ms0 at com? # mouse
## Tadpole SPARCle PS/2 keyboard and mouse
-pckbc* at ebus? # PC keyboard controller
-pckbd* at pckbc? # PC keyboard
-pms* at pckbc? # PS/2 mouse for wsmouse
+pckbc* at ebus? # PC keyboard controller
+pckbd* at pckbc? # PC keyboard
+pms* at pckbc? # PS/2 mouse for wsmouse
options PMS_SYNAPTICS_TOUCHPAD # Enable support for Synaptics Touchpads
-wskbd* at pckbd? console ?
-wsmouse* at pms? mux 0
+wskbd* at pckbd? console ?
+wsmouse* at pms? mux 0
## Magma Serial/Parallel driver (not tested)
#magma* at sbus? slot ? offset ?
@@ -310,9 +310,9 @@ wsmouse* at pms? mux 0
#mbpp* at magma?
## SUNW,spif Serial/Parallel driver
-spif* at sbus? slot ? offset ?
-stty* at spif?
-sbpp* at spif?
+spif* at sbus? slot ? offset ?
+stty* at spif?
+sbpp* at spif?
## PCI serial interfaces
com* at puc? port ? # 16x50s on "universal" comm boards
@@ -340,11 +340,11 @@ esp* at dma? # SBus
esp* at sbus? slot ? offset ?
isp* at sbus? slot ? offset ?
isp* at pci? dev ? function ? # Qlogic ISP [12]0x0 SCSI/FibreChannel
-siop* at pci? # 53C8xx ("glm" compatible)
-esiop* at pci? # 53C875 and newer ("glm" compatible)
+siop* at pci? # 53C8xx ("glm" compatible)
+esiop* at pci? # 53C875 and newer ("glm" compatible)
# PCI SCSI controllers
-# UT marks untested.
+# UT marks untested.
adv* at pci? dev ? function ? # AdvanSys 1200[A,B], 9xx[U,UA] SCSI UT
adw* at pci? dev ? function ? # AdvanSys 9x0UW[D], 3940U[2,3]W SCSI UT
ahc* at pci? dev ? function ? # Adaptec [23]94x, aic78x0 SCSI
@@ -385,7 +385,7 @@ pdcide* at pci? dev ? function ? # Promi
pdcsata* at pci? dev ? function ? # Promise SATA150 controllers
satalink* at pci? dev ? function ? # SiI SATALink controllers
siside* at pci? dev ? function ? # SiS IDE controllers
-slide* at pci? dev ? function ? # Symphony Labs IDE controllers
+slide* at pci? dev ? function ? # Symphony Labs IDE controllers
viaide* at pci? dev ? function ? # VIA/AMD/Nvidia IDE controllers
# ATA (IDE) bus support
@@ -425,12 +425,12 @@ ld* at mlx? unit ?
# register space (it is mapped in to fdthree not auxio).
fdc0 at sbus? slot ? offset ? # SUNW,fdtwo
#fdc0 at ebus? # fdthree, EXPERIMENTAL
-fd* at fdc0 # the drive itself
+fd* at fdc0 # the drive itself
#
# accept filters
-pseudo-device accf_data # "dataready" accept filter
-pseudo-device accf_http # "httpready" accept filter
+pseudo-device accf_data # "dataready" accept filter
+pseudo-device accf_http # "httpready" accept filter
## A disk-like interface to files. Can be used to create floppy, CD,
## miniroot images, etc.
@@ -486,7 +486,7 @@ le* at lebuffer? # SBus
## Happy Meal Ethernet
hme* at sbus? slot ? offset ?
-hme* at pci? dev ? function ? # network "hme" compatible
+hme* at pci? dev ? function ? # network "hme" compatible
## qec/be, qec/hme
qec* at sbus? slot ? offset ?
@@ -494,7 +494,7 @@ be* at qec?
qe* at qec?
# PCI network interfaces
-# UT marks untested.
+# UT marks untested.
an* at pci? dev ? function ? # Aironet PC4500/PC4800 (802.11) UT
ath* at pci? dev ? function ? # Atheros 5210/5211/5212 802.11 UT
bge* at pci? dev ? function ? # Broadcom 570x gigabit Ethernet
@@ -545,15 +545,15 @@ dmphy* at mii? phy ? # Davicom DM9101
exphy* at mii? phy ? # 3Com internal PHYs
gentbi* at mii? phy ? # Generic Ten-Bit 1000BASE-[CLS]X PHYs
gphyter* at mii? phy ? # NS83861 Gig-E PHY
-icsphy* at mii? phy ? # Integrated Circuit Systems ICS189x
+icsphy* at mii? phy ? # Integrated Circuit Systems ICS189x
ikphy* at mii? phy ? # Intel 82563 PHYs
inphy* at mii? phy ? # Intel 82555 PHYs
iophy* at mii? phy ? # Intel 82553 PHYs
igphy* at mii? phy ? # Intel IGP01E1000
-lxtphy* at mii? phy ? # Level One LXT-970 PHYs
+lxtphy* at mii? phy ? # Level One LXT-970 PHYs
makphy* at mii? phy ? # Marvell Semiconductor 88E1000 PHYs
nsphy* at mii? phy ? # NS83840 PHYs
-nsphyter* at mii? phy ? # NS83843 PHYs
+nsphyter* at mii? phy ? # NS83843 PHYs
qsphy* at mii? phy ? # Quality Semiconductor QS6612 PHYs
rgephy* at mii? phy ? # Realtek 8169S/8110S internal PHYs
rlphy* at mii? phy ? # Realtek 8139/8201L PHYs
@@ -565,7 +565,7 @@ ukphy* at mii? phy ? # generic unknown
# PCI USB controllers
ehci* at pci? dev ? function ? # Enhanced Host Controller
ohci* at pci? dev ? function ? # Open Host Controller
-uhci* at pci? dev ? function ? # Universal Host Controller (Intel)
+uhci* at pci? dev ? function ? # Universal Host Controller (Intel)
# USB bus support
usb* at ehci?
@@ -578,7 +578,7 @@ uhub* at usb?
uhub* at uhub? port ?
# USB HID device
-uhidev* at uhub? port ? configuration ? interface ?
+uhidev* at uhub? port ? configuration ? interface ?
# USB Mice
ums* at uhidev? reportid ?
@@ -596,7 +596,7 @@ wskbd* at ukbd? console ? mux 1
uthum* at uhidev? reportid ?
# USB serial adapter
-ucycom* at uhidev? reportid ?
+ucycom* at uhidev? reportid ?
# USB Generic HID devices
uhid* at uhidev? reportid ?
@@ -605,7 +605,7 @@ uhid* at uhidev? reportid ?
ulpt* at uhub? port ? configuration ? interface ?
# USB Modem
-umodem* at uhub? port ? configuration ?
+umodem* at uhub? port ? configuration ?
ucom* at umodem?
# Option N.V. Wireless WAN modems
@@ -616,7 +616,7 @@ umass* at uhub? port ? configuration ? i
wd* at umass?
# USB audio
-uaudio* at uhub? port ? configuration ?
+uaudio* at uhub? port ? configuration ?
# USB MIDI
umidi* at uhub? port ? configuration ?
@@ -667,7 +667,7 @@ ucom* at uvscom? portno ?
urio* at uhub? port ?
# USB Handspring Visor
-uvisor* at uhub? port ?
+uvisor* at uhub? port ?
ucom* at uvisor?
# Kyocera AIR-EDGE PHONE
@@ -691,7 +691,7 @@ radio* at udsbr?
ugen* at uhub? port ?
# Firewire support
-fwohci* at pci? dev ? function ? # IEEE1394 Open Host Controller
+fwohci* at pci? dev ? function ? # IEEE1394 Open Host Controller
ieee1394if* at fwohci?
fwip* at ieee1394if? # IP over IEEE1394
sbp* at ieee1394if? euihi ? euilo ?
@@ -756,7 +756,7 @@ pseudo-device stf # 6to4 IPv6 over IPv
## SBus to PCMCIA bridge
#nell* at sbus? slot ? offset ? # PCMCIA bridge
-#pcmcia* at nell?
+#pcmcia* at nell?
## CardBus cards; UT marks untested.
@@ -868,7 +868,7 @@ btsco* at bthub?
audiocs* at sbus? slot ? offset ? # SUNW,CS4231
audiocs* at ebus? # SUNW,CS4231 in U5/U10
autri* at pci? dev ? function ? # Blade 100 'sound'
-auacer* at pci? dev ? function ? # Ultra45
+auacer* at pci? dev ? function ? # Ultra45
audio* at audiobus?
@@ -887,7 +887,7 @@ cgthree* at sbus? slot ? offset ?
cgsix* at sbus? slot ? offset ?
## Southland Media Systems (now Quantum 3D) MGX
-mgx* at sbus? slot ? offset ?
+mgx* at sbus? slot ? offset ?
## Sun FFB
ffb* at mainbus0
@@ -898,7 +898,7 @@ ffb* at upa?
gfb* at mainbus0
# On board vga on U5/U10 etc.
-machfb* at pci?
+machfb* at pci?
# Sun XVR-100
radeonfb* at pci?
@@ -911,21 +911,21 @@ wcfb* at pci?
# generic PCI framebuffers
genfb* at pci?
-genfb* at sbus? slot ? offset ?
+genfb* at sbus? slot ? offset ?
# make sure the console display is always wsdisplay0
wsdisplay0 at wsemuldisplaydev? console 1
wsdisplay* at wsemuldisplaydev?
# wsmouse for sun ms
-wsmouse* at ms0
+wsmouse* at ms0
# wskbd for sun kbd
-wskbd0 at kbd0
+wskbd0 at kbd0
# various options for wscons - we try to look as much like a standard
# sun console as possible
-#options WSEMUL_SUN # sun terminal emulation
+#options WSEMUL_SUN # sun terminal emulation
options WSEMUL_VT100 # allow us to be wsvt25
options WS_DEFAULT_FG=WSCOL_BLACK
options WS_DEFAULT_BG=WSCOL_LIGHT_WHITE
@@ -940,7 +940,7 @@ options FONT_DROID_SANS_MONO12x22 # ant
#### Other device configuration
psm* at ebus? # Ultrabook IIi microcontroller
-pcfiic* at ebus? # various environmental monitoring
+pcfiic* at ebus? # various environmental monitoring
iic* at pcfiic?
lom* at ebus? # LOMlite lights out management
@@ -948,18 +948,18 @@ lom* at ebus? # LOMlite lights out man
alipm* at pci?
iic* at alipm?
-spdmem* at iic? addr?
+spdmem* at iic? addr?
admtemp* at iic? addr?
adm1026hm* at iic? addr?
ecadc* at iic? addr? # envctrl/envctrltwo on E250/E450
-lmtemp* at iic? addr?
+lmtemp* at iic? addr?
tda* at iic? addr? # fan control on SB1000/2000
-dbcool* at iic? addr? # SB25000
+dbcool* at iic? addr? # SB25000
seeprom* at iic? addr? # i2c-at24c64 fru's
### Other pseudo-devices
-pseudo-device crypto # /dev/crypto device
+pseudo-device crypto # /dev/crypto device
pseudo-device swcrypto # software crypto implementation
## Pseudo ttys, required for network logins and programs like screen.
@@ -982,7 +982,7 @@ pseudo-device fss # file system snapsh
pseudo-device lockstat # lock profiling
pseudo-device putter # for puffs and pud
-options FILEASSOC # fileassoc(9) - required for Veriexec
+options FILEASSOC # fileassoc(9) - required for Veriexec
# Veriexec
#
@@ -993,23 +993,23 @@ pseudo-device veriexec
# removing fingerprint methods will have almost no impact on the kernel
# code size.
#
-options VERIFIED_EXEC_FP_RMD160
-options VERIFIED_EXEC_FP_SHA256
-options VERIFIED_EXEC_FP_SHA384
-options VERIFIED_EXEC_FP_SHA512
-options VERIFIED_EXEC_FP_SHA1
-options VERIFIED_EXEC_FP_MD5
+options VERIFIED_EXEC_FP_RMD160
+options VERIFIED_EXEC_FP_SHA256
+options VERIFIED_EXEC_FP_SHA384
+options VERIFIED_EXEC_FP_SHA512
+options VERIFIED_EXEC_FP_SHA1
+options VERIFIED_EXEC_FP_MD5
# a pseudo device needed for SMBFS
-pseudo-device nsmb # experimental - SMB requester
+pseudo-device nsmb # experimental - SMB requester
# drvctl - needed to show device dictionary via drvctl(8)
pseudo-device drvctl
-options PAX_ASLR_DEBUG=1 # PaX ASLR debug
-options PAX_SEGVGUARD=0 # PaX Segmentation fault guard
+options PAX_ASLR_DEBUG=1 # PaX ASLR debug
+options PAX_SEGVGUARD=0 # PaX Segmentation fault guard
# XXX: there is no PLT format for sparc64 that cooperates with
# MPROTECT, so disable it for now
-options PAX_MPROTECT=0 # PaX mprotect(2) restrictions
-options PAX_MPROTECT_DEBUG=1 # PaX mprotect debug
-options PAX_ASLR=1 # PaX Address Space Layout Randomization
+options PAX_MPROTECT=0 # PaX mprotect(2) restrictions
+options PAX_MPROTECT_DEBUG=1 # PaX mprotect debug
+options PAX_ASLR=1 # PaX Address Space Layout Randomization
Index: src/sys/arch/sparc64/conf/GENERIC.DEBUG
diff -u src/sys/arch/sparc64/conf/GENERIC.DEBUG:1.2 src/sys/arch/sparc64/conf/GENERIC.DEBUG:1.3
--- src/sys/arch/sparc64/conf/GENERIC.DEBUG:1.2 Mon Dec 26 19:33:20 2011
+++ src/sys/arch/sparc64/conf/GENERIC.DEBUG Wed May 25 20:00:50 2016
@@ -1,11 +1,11 @@
-# $NetBSD: GENERIC.DEBUG,v 1.2 2011/12/26 19:33:20 martin Exp $
+# $NetBSD: GENERIC.DEBUG,v 1.3 2016/05/25 20:00:50 nakayama Exp $
#
# GENERIC with debugging support enabled.
#
include "arch/sparc64/conf/GENERIC"
-#ident "GENERIC.DEBUG.$Revision: 1.2 $"
+#ident "GENERIC.DEBUG.$Revision: 1.3 $"
makeoptions DEBUG="-g"
options DEBUG
@@ -13,4 +13,4 @@ options DEBUG
options LOCKDEBUG
options DB_MAX_WIDTH=160
-options DDB_ONPANIC=2 # print stack trace
+options DDB_ONPANIC=2 # print stack trace
Index: src/sys/arch/sparc64/conf/GENERIC.UP
diff -u src/sys/arch/sparc64/conf/GENERIC.UP:1.1 src/sys/arch/sparc64/conf/GENERIC.UP:1.2
--- src/sys/arch/sparc64/conf/GENERIC.UP:1.1 Sat Mar 13 08:36:06 2010
+++ src/sys/arch/sparc64/conf/GENERIC.UP Wed May 25 20:00:50 2016
@@ -1,12 +1,12 @@
-# $NetBSD: GENERIC.UP,v 1.1 2010/03/13 08:36:06 mrg Exp $
+# $NetBSD: GENERIC.UP,v 1.2 2016/05/25 20:00:50 nakayama Exp $
#
# GENERIC kernel configuration without multiprocessor support.
#
include "arch/sparc64/conf/GENERIC"
-#ident "GENERIC-$Revision: 1.1 $"
+#ident "GENERIC-$Revision: 1.2 $"
-no options MULTIPROCESSOR
+no options MULTIPROCESSOR
no cpu
cpu0 at mainbus0
Index: src/sys/arch/sparc64/conf/GENERIC32.UP
diff -u src/sys/arch/sparc64/conf/GENERIC32.UP:1.1 src/sys/arch/sparc64/conf/GENERIC32.UP:1.2
--- src/sys/arch/sparc64/conf/GENERIC32.UP:1.1 Sat Mar 13 08:36:06 2010
+++ src/sys/arch/sparc64/conf/GENERIC32.UP Wed May 25 20:00:50 2016
@@ -1,12 +1,12 @@
-# $NetBSD: GENERIC32.UP,v 1.1 2010/03/13 08:36:06 mrg Exp $
+# $NetBSD: GENERIC32.UP,v 1.2 2016/05/25 20:00:50 nakayama Exp $
#
# GENERIC kernel configuration for 32-bit kernel without multiprocessor support.
#
include "arch/sparc64/conf/GENERIC32"
-#ident "GENERIC32.UP-$Revision: 1.1 $"
+#ident "GENERIC32.UP-$Revision: 1.2 $"
-no options MULTIPROCESSOR
+no options MULTIPROCESSOR
no cpu
-cpu0 at mainbus0
+cpu0 at mainbus0
Index: src/sys/arch/sparc64/conf/GENERIC32
diff -u src/sys/arch/sparc64/conf/GENERIC32:1.140 src/sys/arch/sparc64/conf/GENERIC32:1.141
--- src/sys/arch/sparc64/conf/GENERIC32:1.140 Fri Jun 30 10:27:48 2006
+++ src/sys/arch/sparc64/conf/GENERIC32 Wed May 25 20:00:50 2016
@@ -1,13 +1,13 @@
-# $NetBSD: GENERIC32,v 1.140 2006/06/30 10:27:48 tsutsui Exp $
+# $NetBSD: GENERIC32,v 1.141 2016/05/25 20:00:50 nakayama Exp $
#
# GENERIC machine description file for 32-bit kernel
#
include "arch/sparc64/conf/GENERIC"
-#ident "GENERIC32-$Revision: 1.140 $"
+#ident "GENERIC32-$Revision: 1.141 $"
include "arch/sparc64/conf/std.sparc64-32"
-no options COMPAT_NETBSD32
-no options COMPAT_SVR4_32
+no options COMPAT_NETBSD32
+no options COMPAT_SVR4_32
Index: src/sys/arch/sparc64/conf/INSTALL
diff -u src/sys/arch/sparc64/conf/INSTALL:1.29 src/sys/arch/sparc64/conf/INSTALL:1.30
--- src/sys/arch/sparc64/conf/INSTALL:1.29 Sun Dec 15 07:52:53 2013
+++ src/sys/arch/sparc64/conf/INSTALL Wed May 25 20:00:50 2016
@@ -1,12 +1,12 @@
-# $NetBSD: INSTALL,v 1.29 2013/12/15 07:52:53 christos Exp $
+# $NetBSD: INSTALL,v 1.30 2016/05/25 20:00:50 nakayama Exp $
#
# NOTE: this file only needs *additional* things for the install
# kernel, that are not already included in GENERIC!
# See the include below...
-include "arch/sparc64/conf/GENERIC"
+include "arch/sparc64/conf/GENERIC"
-#ident "INSTALL-$Revision: 1.29 $"
+#ident "INSTALL-$Revision: 1.30 $"
makeoptions COPTS="-Os -Wno-uninitialized"
Index: src/sys/arch/sparc64/conf/MODULAR
diff -u src/sys/arch/sparc64/conf/MODULAR:1.5 src/sys/arch/sparc64/conf/MODULAR:1.6
--- src/sys/arch/sparc64/conf/MODULAR:1.5 Tue Mar 12 21:52:47 2013
+++ src/sys/arch/sparc64/conf/MODULAR Wed May 25 20:00:50 2016
@@ -1,4 +1,4 @@
-# $NetBSD: MODULAR,v 1.5 2013/03/12 21:52:47 christos Exp $
+# $NetBSD: MODULAR,v 1.6 2016/05/25 20:00:50 nakayama Exp $
#
# MODULAR kernel - like GENERIC, but excluding lots of stuff that can
# be loaded as a module later
@@ -6,20 +6,20 @@
include "arch/sparc64/conf/GENERIC"
-#ident "MODULAR-$Revision: 1.5 $"
+#ident "MODULAR-$Revision: 1.6 $"
-options INSECURE # disable kernel security levels initially
+options INSECURE # disable kernel security levels initially
# (we can't load file system modules otherwise)
-#no options EXEC_AOUT # execve(2) support for a.out binaries
-#no options EXEC_ELF32 # Exec module for SunOS 5.x binaries.
+#no options EXEC_AOUT # execve(2) support for a.out binaries
+#no options EXEC_ELF32 # Exec module for SunOS 5.x binaries.
-#no options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended.
-no options COMPAT_BSDPTY # /dev/[pt]ty?? ptys.
+#no options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended.
+no options COMPAT_BSDPTY # /dev/[pt]ty?? ptys.
no file-system KERNFS # kernel data-structure filesystem
no file-system NULLFS # NULL layered filesystem
-no file-system OVERLAY # overlay file system
+no file-system OVERLAY # overlay file system
no file-system MFS # memory-based filesystem
no file-system FDESC # user file descriptor filesystem
no file-system UMAPFS # uid/gid remapping filesystem
Index: src/sys/arch/sparc64/conf/NONPLUS
diff -u src/sys/arch/sparc64/conf/NONPLUS:1.58 src/sys/arch/sparc64/conf/NONPLUS:1.59
--- src/sys/arch/sparc64/conf/NONPLUS:1.58 Fri Jun 30 10:27:48 2006
+++ src/sys/arch/sparc64/conf/NONPLUS Wed May 25 20:00:50 2016
@@ -1,9 +1,9 @@
-# $NetBSD: NONPLUS,v 1.58 2006/06/30 10:27:48 tsutsui Exp $
+# $NetBSD: NONPLUS,v 1.59 2016/05/25 20:00:50 nakayama Exp $
-include "arch/sparc64/conf/NONPLUS64"
-include "arch/sparc64/conf/std.sparc64-32"
+include "arch/sparc64/conf/NONPLUS64"
+include "arch/sparc64/conf/std.sparc64-32"
-#ident "NONPLUS-$Revision: 1.58 $"
+#ident "NONPLUS-$Revision: 1.59 $"
-no options COMPAT_NETBSD32 # NetBSD/sparc binary compatibility
-no options COMPAT_SVR4_32 # 32-bit SVR4 binaries
+no options COMPAT_NETBSD32 # NetBSD/sparc binary compatibility
+no options COMPAT_SVR4_32 # 32-bit SVR4 binaries
Index: src/sys/arch/sparc64/conf/NONPLUS64
diff -u src/sys/arch/sparc64/conf/NONPLUS64:1.46 src/sys/arch/sparc64/conf/NONPLUS64:1.47
--- src/sys/arch/sparc64/conf/NONPLUS64:1.46 Sat Sep 26 11:16:13 2015
+++ src/sys/arch/sparc64/conf/NONPLUS64 Wed May 25 20:00:50 2016
@@ -1,8 +1,8 @@
-# $NetBSD: NONPLUS64,v 1.46 2015/09/26 11:16:13 maxv Exp $
+# $NetBSD: NONPLUS64,v 1.47 2016/05/25 20:00:50 nakayama Exp $
-include "arch/sparc64/conf/std.sparc64"
+include "arch/sparc64/conf/std.sparc64"
-#ident "NONPLUS64-$Revision: 1.46 $"
+#ident "NONPLUS64-$Revision: 1.47 $"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
@@ -123,14 +123,14 @@ options EXEC_ELF32 # Exec module for Ne
options EXEC_AOUT # Exec module for NetBSD/sparc pre-1.5 binaries.
#options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended.
-options COMPAT_BSDPTY # /dev/[pt]ty?? ptys.
+options COMPAT_BSDPTY # /dev/[pt]ty?? ptys.
## File systems. You probably need at least one of FFS or NFS.
file-system FFS # Berkeley Fast Filesystem
file-system NFS # Sun NFS-compatible filesystem client
file-system KERNFS # kernel data-structure filesystem
file-system NULLFS # NULL layered filesystem
-file-system OVERLAY # overlay file system
+file-system OVERLAY # overlay file system
file-system MFS # memory-based filesystem
file-system FDESC # user file descriptor filesystem
file-system UMAPFS # uid/gid remapping filesystem
@@ -297,7 +297,7 @@ uk* at scsibus? target ? lun ? # unknow
## A disk-like interface to files. Can be used to create floppy, CD,
## miniroot images, etc.
-pseudo-device vnd
+pseudo-device vnd
## Concatenated and striped disks; with this, you can create a software-based
## disk array similar to a "RAID 0" setup. See ccd(4).
@@ -307,7 +307,7 @@ pseudo-device ccd
## Memory disk device, used on boot floppies with compressed
## kernel-plus-root-disk images.
-#pseudo-device md
+#pseudo-device md
#### Network interfaces
@@ -337,17 +337,17 @@ le* at lebuffer? # SBus
pseudo-device loop
## SLIP and CSLIP interfaces, for IP over a serial line.
-#pseudo-device sl
+#pseudo-device sl
## PPP, the successor to SLIP. See pppd(8).
-pseudo-device ppp
+pseudo-device ppp
## Starmode Radio IP, a special hardware network device.
-#pseudo-device strip
+#pseudo-device strip
## Network "tunnel" device, allowing protocol stacks to run in the userland.
## This is used by the third-party user-mode "ppp" program, and others.
-pseudo-device tun
+pseudo-device tun
## Berkeley Packet Filter, required to run RARPD. A generic C-language
## interface that allows selective examining of incoming packets.
