Subject: making conf/GENERIC really generic
To: None <port-sparc64@NetBSD.org>
From: Izumi Tsutsui <tsutsui@ceres.dti.ne.jp>
List: port-sparc64
Date: 06/29/2006 03:07:14
In article <24571.1138999592@splode.eterna.com.au> on source-changes
mrg@eterna.com.au wrote:

>    XXX Is it better to make GENERIC really generic and change GENERIC32
>    XXX to use "no options" and "no makeoptions" features of newer config(1)?
> 
> yes please!

How about this patch? (sorry for too late response)
---
Izumi Tsutsui


Index: GENERIC
===================================================================
RCS file: /cvsroot/src/sys/arch/sparc64/conf/GENERIC,v
retrieving revision 1.52
diff -u -r1.52 GENERIC
--- GENERIC	10 Dec 2005 14:46:37 -0000	1.52
+++ GENERIC	28 Jun 2006 18:01:27 -0000
@@ -1,7 +1,7 @@
-# $NetBSD: GENERIC,v 1.52 2005/12/10 14:46:37 tsutsui Exp $
+# $NetBSD$
 #
 # GENERIC machine description file
-# 
+#
 # This machine description file is used to generate the default NetBSD
 # kernel.  The generic kernel does not include all options, subsystems
 # and device drivers, but should be useful for most applications.
@@ -18,19 +18,853 @@
 # of each device driver in this file see the section 4 man page for the
 # device.
 
-include 	"arch/sparc64/conf/GENERIC32"
+include	"arch/sparc64/conf/std.sparc64"
 
-#ident 	"GENERIC-$Revision: 1.52 $"
+options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-include 	"arch/sparc64/conf/std.sparc64-64"
+#ident 		"GENERIC-$Revision: 1.138 $"
 
-options 	COMPAT_NETBSD32	# NetBSD/sparc binary compatibility
-options 	COMPAT_SVR4_32	# SunOS 5.x 32-bit binary compatibility
+maxusers	64
 
-# DEBUG options
+## System kernel configuration.  See options(4) for more detail.
+
+
+# Options for variants of the Sun SPARC architecure.
+# We currently support three architecture types; at least one is required.
+options 	SUN4U		# sun4u - UltraSPARC
+#options 	BLINK		# blink the system LED
+
+#### System options that are the same for all ports
+
+## Root device configuration: change the ?'s if you are going to use a
+## nonstandard root partition (other than where the kernel is booted from)
+## and/or nonstandard root type (not ffs or nfs).  Normally this can be
+## automagically determined at boot time.
+
+config		netbsd	root on ? type ?
+
+## UVM options.
+#options 	UVM_PAGE_TRKOWN
+#options 	UVMHIST
+#options 	UVMHIST_PRINT	# Loud!
+
+## System call tracing (see ktrace(1)).
+options 	KTRACE
+options 	SYSTRACE		# system call vetting via systrace(1)
+
+## Collect statistics on kernel malloc's and free's.  This does have a
+## significant performance hit on slower machines, so it is intended for
+## diagnostic use only.
+#options 	KMEMSTATS
+
+## System V compatible IPC subsystem.  (msgctl(2), semctl(2), and shmctl(2))
+options 	SYSVMSG		# System V message queues
+options 	SYSVSEM		# System V semaphores
+options 	SYSVSHM		# System V shared memory
+#options 	SHMMAXPGS=1024	# 1024 pages is the default
+options 	P1003_1B_SEMAPHORE	# p1003.1b semaphore support 
+
+
+## Loadable kernel module support; still under development.
+options 	LKM
+
+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 
+# high disk I/O load. Use it with caution - it's not proven to be stable yet.
+#options 	BUFQ_READPRIO
+#options 	BUFQ_PRIOCSCAN
+
+## NFS boot options; tries DHCP/BOOTP then BOOTPARAM
+options 	NFS_BOOT_BOOTPARAM
+#options 	NFS_BOOT_BOOTP
+options 	NFS_BOOT_DHCP
+
+#### Debugging options
+
+## The DDB in-kernel debugger runs at panic (unless DDB_ONPANIC=0), or at
+## serial console break or keyboard reset, where the PROM would normally
+## intercept.  DDB_HISTORY_SIZE adds up/down arrow command history.
+# we enable DDB in GENERIC for now.
+options 	DDB			# kernel dynamic debugger
+options 	DDB_HISTORY_SIZE=100	# enable history editing in DDB
+#options 	DDB_ONPANIC		# see also sysctl(8): `ddb.onpanic'
+
+## You may also use gdb, on another computer connected to this machine over
+## a serial port.
+# ttyb on an Ultra5 is aliased to: "/pci@1f,0/pci@1,1/ebus@1/se:b", which is
+# "/pci@1f,0/pci@1,1/ebus@1/se@14,400000", port b.
+# options 	KGDB			# support for kernel gdb
+# options 	KGDB_DEVNAME="\"sab\""	# driver name for the kgdb serial chip
+# options 	KGDB_DEVADDR=0x400000	# physical address of the chip
+# options 	KGDB_DEVPORT=1		# port b
+# options 	KGDB_DEVRATE=38400	# baud rate
+
+
+## Compile the kernel with debugging symbols (`netbsd.gdb' is the debug file),
+## such that gdb(1) can be used on a kernel coredump.
 
-#options 	LOCKDEBUG
-#options 	DIAGNOSTIC
 #makeoptions	DEBUG="-g"
+
+
+## Adds code to the kernel that does internal consistency checks, and will
+## cause the kernel to panic if corruption of internal data structures
+## is detected.
+#options 	DIAGNOSTIC	# extra kernel sanity checking
+
+## Enable (possibly expensive) debugging code that may also display messages
+## on the system console
 #options 	DEBUG
+#options 	LOCKDEBUG
 #options 	SYSCALL_DEBUG
+
+## Make SCSI error messages more verbose when explaining their meanings.
+options 	SCSIVERBOSE
+options 	PCIVERBOSE
+options 	MIIVERBOSE	# verbose PHY autoconfig messages
+#options 	PCI_CONFIG_DUMP	# verbosely dump PCI config space
+
+## `INSECURE' turns off the kernel security level (securelevel = 0 always).
+## This allows writing to /dev/mem, loading kernel modules while multi-user,
+## and other insecurities good only for development work.  Do not use this
+## option on a production machine.
+#options 	INSECURE
+
+## `FDSCRIPTS' allows non-readable but executable scripts by providing a
+## pre-opened opaque file to the script interpreter.  `SETUIDSCRIPTS',
+## which implies FDSCRIPTS, allows scripts to be set-user-id using the same
+## opaque file mechanism.  Perl calls this "secure setuid scripts."
+
+#options 	FDSCRIPTS
+#options 	SETUIDSCRIPTS
+
+## Options for compatibility with previous releases foreign system binaries.
+## In the cases of COMPAT_SUNOS and COMPAT_SVR4, you may need to set up
+## additional user-level utilities or system configuration files. See
+## compat_sunos(8) and compat_svr4(8).
+
+options 	COMPAT_43	# 4.3BSD system interfaces
+options 	COMPAT_09	# NetBSD 0.9 binary compatibility
+options 	COMPAT_10	# NetBSD 1.0 binary compatibility
+options 	COMPAT_11	# NetBSD 1.1 binary compatibility
+options 	COMPAT_12	# NetBSD 1.2 binary compatibility
+options 	COMPAT_13	# NetBSD 1.3 binary compatibility
+options 	COMPAT_14	# NetBSD 1.4 binary compatibility
+options 	COMPAT_15	# NetBSD 1.5 binary compatibility
+options 	COMPAT_16	# NetBSD 1.6 binary compatibility
+options 	COMPAT_20	# NetBSD 2.0 binary compatibility
+options 	COMPAT_30	# NetBSD 3.0 binary compatibility
+options 	COMPAT_SUNOS	# SunOS 4.x binary compatibility
+options 	COMPAT_SVR4	# SunOS 5.x binary compatibility
+options 	COMPAT_SVR4_32	# SunOS 5.x 32-bit binary compatibility -- 64-bit only
+options 	COMPAT_NETBSD32	# NetBSD/sparc binary compatibility -- 64-bit only
+options 	EXEC_AOUT	# execve(2) support for a.out binaries
+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.
+
+## 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	MFS		# memory-based filesystem
+file-system	FDESC		# user file descriptor filesystem
+file-system	UMAPFS		# uid/gid remapping filesystem
+file-system	LFS		# Log-based filesystem (still experimental)
+file-system	PORTAL		# portal filesystem (still experimental)
+file-system	PROCFS		# /proc
+file-system	CD9660		# ISO 9660 + Rock Ridge file system
+file-system	UNION		# union file system
+file-system	MSDOSFS		# MS-DOS FAT filesystem(s).
+file-system	PTYFS		# /dev/pts/N support
+file-system	SMBFS		# experimental - CIFS; also needs nsmb (below)
+#file-system	TMPFS		# experimental - Efficient memory file-system
+#file-system	UDF		# experimental - OSTA UDF CD/DVD file-system
+
+## File system options.
+options 	NFSSERVER	# Sun NFS-compatible filesystem server
+options 	QUOTA		# FFS quotas
+#options 	FFS_EI		# FFS Endian Independent support
+options 	SOFTDEP		# FFS soft updates support.
+#options 	FFS_NO_SNAPSHOT	# No FFS snapshot support
+
+## Network protocol support.  In most environments, INET is required.
+options 	INET		# IP (Internet Protocol) v4
+options 	INET6		# IPV6
+#options 	IPSEC		# IP security
+#options 	IPSEC_ESP	# IP security (encryption part; define w/IPSEC)
+#options 	IPSEC_NAT_T	# IPsec NAT traversal (NAT-T)
+#options 	IPSEC_DEBUG	# debug for IP security
+#options 	GATEWAY		# packet forwarding ("router switch")
+options 	MROUTING	# packet forwarding of multicast packets
+options 	PIM		# Protocol Independent Multicast
+#options 	DIRECTED_BROADCAST	# allow broadcasts through routers
+options 	NS		# Xerox NS networking
+#options 	NSIP		# Xerox NS tunneling over IP
+options 	ISO,TPIP	# OSI networking
+options 	EON		# OSI tunneling over IP
+#options 	CCITT,LLC,HDLC	# X.25 packet switched protocol
+options 	NETATALK	# AppleTalk (over Ethernet) protocol
+options 	NTP		# Network Time Protocol in-kernel support
+#options 	PPS_SYNC	# Add serial line synchronization for NTP
+options 	PFIL_HOOKS	# Add pfil(9) hooks, intended for custom LKMs.
+options 	IPFILTER_LOG	# Add ipmon(8) logging for ipfilter device
+#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
+options 	PPP_FILTER	# Add active filters for ppp (via bpf)
+#options 	TCP_DEBUG	# Record last TCP_NDEBUG packets with SO_DEBUG
+
+#options 	ALTQ		# Manipulate network interfaces' output queues
+#options 	ALTQ_BLUE	# Stochastic Fair Blue
+#options 	ALTQ_CBQ	# Class-Based Queueing
+#options 	ALTQ_CDNR	# Diffserv Traffic Conditioner
+#options 	ALTQ_FIFOQ	# First-In First-Out Queue
+#options 	ALTQ_FLOWVALVE	# RED/flow-valve (red-penalty-box)
+#options 	ALTQ_HFSC	# Hierarchical Fair Service Curve
+#options 	ALTQ_LOCALQ	# Local queueing discipline
+#options 	ALTQ_PRIQ	# Priority Queueing
+#options 	ALTQ_RED	# Random Early Detection
+#options 	ALTQ_RIO	# RED with IN/OUT
+#options 	ALTQ_WFQ	# Weighted Fair Queueing
+
+
+#### Main bus and CPU .. all systems.
+mainbus0 at root
+cpu0	at mainbus0
+
+#### Bus types found on SPARC systems.
+
+sbus*	at mainbus0				# SBus-based systems
+psycho*	at mainbus0				# PCI-based systems
+pci*	at psycho?
+pci*	at ppb?
+ppb*	at pci?					# `APB' support.
+ebus*	at pci?					# ebus devices
+# XXX 'puc's aren't really bridges, but there's no better place for them here
+puc*	at pci? dev ? function ?		# PCI "universal" comm. cards
+
+#### Standard system devices -- all required for a given architecture
+
+## PROM console driver -- if all else fails
+pcons0	at mainbus0				# PROM console
+
+## Auxiliary system registers -- We use the OBP for power management
+auxio*	at ebus?				# auxio registers
+auxio*	at sbus? slot ? offset ?		# auxio registers
+
+# We also need:
+bpp*	at sbus? slot ? offset ?		# parallel port
+lpt*	at ebus?				# parallel port
+
+## Mostek clock found on 4/300, sun4c, sun4m and sun4u systems.
+## The Mostek clock NVRAM is the "eeprom" on sun4/300 systems.
+clock*	at sbus? slot ? offset ?
+clock*	at ebus?
+rtc*	at ebus?
+
+## Timer chip found on 4/300, sun4c, sun4m and (some) sun4u systems.
+timer*	at mainbus0				# sun4c
+
+#### Serial port configuration
+
+## Zilog 8530 serial chips.  Each has two-channels.
+## zs0 is ttya and ttyb.  zs1 is the keyboard and mouse.
+zs*	at sbus? slot ? offset ?
+zstty*	at zs? channel ?			# ttya
+kbd0	at zstty?
+ms0	at zstty?
+
+## PCI machines have serial ports:
+##	Siemens SAB82532 controller: ttya and ttyb (`su'; sab)
+##	Part of NS PC87332VLJ Super I/O controller: kbd/mouse (`se'; com)
+
+## The SAB82532 controller has two serial ports
+sab*	at ebus?				# ttya/ttyb
+sabtty*	at sab? channel ?
+
+## Part of a PC87332VLJ
+com*	at ebus?				# `com' driver for `su'
+kbd0	at com?					# keyboard
+ms0	at com?					# mouse
+
+## Magma Serial/Parallel driver (not tested)
+#magma*	at sbus? slot ? offset ?
+#mtty*	at magma?
+#mbpp*	at magma?
+
+## SUNW,spif Serial/Parallel driver (not tested)
+#spif*  at sbus? slot ? offset ?
+#stty*  at spif?
+#sbpp*  at spif?
+
+## PCI serial interfaces
+com*	at puc? port ?			# 16x50s on "universal" comm boards
+cy*	at pci? dev ? function ?	# Cyclades Cyclom-Y serial boards
+cz*	at pci? dev ? function ?	# Cyclades-Z multi-port serial boards
+
+
+#### Disk controllers and disks
+
+## The following flags may be set for the NCR53c94 based esp driver:
+##	bits 0-7:  disable disconnect/reselect for the corresponding target
+##	bits 8-15: disable synchronous negotiation for target [bit-8]
+##	bits 16-23: disable tagged queuing for target [bit-16]
+
+## sun4u on-board SCSI, and FSBE/S SBus SCSI cards, an NCR53c94 or
+## equivalent behind an LSI Logic DMA controller
+
+dma*	at sbus? slot ? offset ?		# SBus
+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)
+
+# PCI cryptographic devices
+hifn*	at pci? dev ? function ?	# Hifn 7755/7811/795x
+ubsec*	at pci? dev ? function ?	# Broadcom 5501/5601/580x/582x
+
+# PCI SCSI controllers
+# 	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
+bha*	at pci? dev ? function ?	# BusLogic 9xx SCSI UT
+dpt*	at pci? dev ? function ?	# DPT SmartCache/SmartRAID UT
+iha*	at pci? dev ? function ?	# Initio INIC-940/950 SCSI
+njs*	at pci? dev ? function ?	# Workbit NinjaSCSI-32
+pcscp*	at pci? dev ? function ?	# AMD 53c974 PCscsi-PCI SCSI
+trm*	at pci? dev ? function ?	# Tekram DC-395U/UW/F, DC-315/U SCSI
+
+scsibus* at scsi?
+
+## These entries find devices on all SCSI busses and assign
+## unit numbers dynamically.
+sd*	at scsibus? target ? lun ?		# SCSI disks
+st*	at scsibus? target ? lun ?		# SCSI tapes
+cd*	at scsibus? target ? lun ?		# SCSI CD-ROMs
+ch*	at scsibus? target ? lun ?		# SCSI changer devices
+ss*	at scsibus? target ? lun ?		# SCSI scanners
+ses*	at scsibus? target ? lun ?		# SCSI SES/SAF-TE devices
+uk*	at scsibus? target ? lun ?		# unknown SCSI
+
+# IDE and related devices
+# PCI IDE controllers - see pciide(4) for supported hardware.
+# The 0x0001 flag force the driver to use DMA, even if the driver doesn't know
+# how to set up DMA modes for this chip. This may work, or may cause
+# a machine hang with some controllers.
+pciide* at pci? dev ? function ? flags 0x0000	# GENERIC pciide driver
+acardide* at pci? dev ? function ?	# Acard IDE controllers
+aceride* at pci? dev ? function ?	# Acer Lab IDE controllers
+artsata* at pci? dev ? function ?	# Intel i31244 SATA controller
+cmdide* at pci? dev ? function ?	# CMD tech IDE controllers
+cypide* at pci? dev ? function ?	# Cypress IDE controllers
+hptide* at pci? dev ? function ?	# Triones/HighPoint IDE controllers
+optiide* at pci? dev ? function ?	# Opti IDE controllers
+pdcide* at pci? dev ? function ?	# Promise IDE controllers
+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
+viaide* at pci? dev ? function ?	# VIA/AMD/Nvidia IDE controllers
+
+# ATA (IDE) bus support
+atabus* at ata?
+atapibus* at atapi?
+
+# IDE drives
+# Flags are used only with controllers that support DMA operations
+# and mode settings (e.g. some pciide controllers)
+# The lowest order four bits (rightmost digit) of the flags define the PIO
+# mode to use, the next set of four bits the DMA mode and the third set the
+# UltraDMA mode. For each set of four bits, the 3 lower bits define the mode
+# to use, and the last bit must be 1 for this setting to be used.
+# For DMA and UDMA, 0xf (1111) means 'disable'.
+# 0x0fac means 'use PIO mode 4, DMA mode 2, disable UltraDMA'.
+# (0xc=1100, 0xa=1010, 0xf=1111)
+# 0x0000 means "use whatever the drive claims to support".
+
+## Disable UDMA 4 which causes data corruption on the Acer Labs
+## chipset on Sun Blade 100 and Netra X1 machines.
+wd*     at atabus? drive ? flags 0x0000
+
+cd*	at atapibus? drive ? flags 0x0000	# ATAPI CD-ROM drives
+sd*	at atapibus? drive ? flags 0x0000	# ATAPI disk drives
+uk*	at atapibus? drive ? flags 0x0000	# ATAPI unknown
+
+# RAID controllers and devices (untested)
+cac*	at pci? dev ? function ?	# Compaq PCI array controllers
+mlx*	at pci? dev ? function ?	# Mylex DAC960 & DEC SWXCR family
+twe*	at pci? dev ? function ?	# 3ware Escalade RAID controllers
+
+ld*	at cac? unit ?			# logical disk devices
+ld*	at twe? unit ?
+ld*	at mlx? unit ?
+
+## Floppy controller and drive found on SPARCstations.
+
+# need share with the sparc, and everyone else.  needs to use auxio.
+# actually, the ebus version has (will have) direct access to it's AUXIO
+# register space (it is mapped in to fdthree not auxio).
+#fdc0	at sbus? slot ? offset ?		# SUNW,fdtwo
+#fdc0	at ebus?				# fdthree
+#fd*	at fdc0 	 			# the drive itself
+
+## A disk-like interface to files.  Can be used to create floppy, CD,
+## miniroot images, etc.
+
+pseudo-device	vnd	
+#options 	VND_COMPRESSION		# compressed vnd(4)
+
+## Concatenated and striped disks; with this, you can create a software-based
+## disk array similar to a "RAID 0" setup.  See ccd(4).
+
+pseudo-device	ccd	4
+
+## Cryptographic disk devices.  See cgd(4).
+
+#pseudo-device	cgd	4
+
+## RAIDframe disk driver: software RAID driver.  See raid(4).
+
+pseudo-device	raid	8
+options 	RAID_AUTOCONFIG		# auto-configuration of RAID components
+# Options to enable various other RAIDframe RAID types.
+# options 	RF_INCLUDE_EVENODD=1
+# options 	RF_INCLUDE_RAID5_RS=1
+# options 	RF_INCLUDE_PARITYLOGGING=1
+# options 	RF_INCLUDE_CHAINDECLUSTER=1
+# options 	RF_INCLUDE_INTERDECLUSTER=1
+# options 	RF_INCLUDE_PARITY_DECLUSTERING=1
+# options 	RF_INCLUDE_PARITY_DECLUSTERING_DS=1
+
+
+## Memory disk device, used on boot floppies with compressed
+## kernel-plus-root-disk images.
+
+pseudo-device	md	1
+
+
+#### Network interfaces
+
+## LANCE Ethernet - an AMD 7990 LANCE behind specialized DMA glue
+## Three flavors of additional SBus ethernets are available.  One attaches
+## directly like the sun4c on-board, one uses the ledma device like the
+## sun4m on-board, and one uses the lebuffer device.
+
+ledma0		at sbus? slot ? offset ?	# sun4m on-board
+le0		at ledma0			# sun4m on-board
+le*		at sbus? slot ? offset ?	# SBus
+ledma*		at sbus? slot ? offset ?	# SBus
+le*		at ledma?			# SBus
+lebuffer0	at sbus? slot ? offset ?	# SBus
+le0		at lebuffer?			# SBus
+lebuffer*	at sbus? slot ? offset ?	# SBus
+le*		at lebuffer?			# SBus
+
+## Happy Meal Ethernet
+hme*		at sbus? slot ? offset ?
+hme*		at pci?	dev ? function ?	# network "hme" compatible
+
+## qec/be, qec/hme
+qec*		at sbus? slot ? offset ?
+be*		at qec?
+qe*		at qec?
+
+# PCI network interfaces
+# 	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
+en*	at pci? dev ? function ?	# ENI/Adaptec ATM UT
+# XXX causes ICE
+#ep*	at pci? dev ? function ?	# 3Com 3c59x
+ex*	at pci? dev ? function ?	# 3Com 90x[B]
+epic*	at pci? dev ? function ?	# SMC EPIC/100 Ethernet
+esh*	at pci? dev ? function ?	# Essential HIPPI card UT
+fpa*	at pci? dev ? function ?	# DEC DEFPA FDDI UT
+fxp*	at pci? dev ? function ?	# Intel EtherExpress PRO 10+/100B
+gem*	at pci? dev ? function ?	# Apple GMAC and Sun ERI gigabit enet
+# XXX lacks bus_dmamap_sync()
+#le*	at pci? dev ? function ?	# PCnet-PCI Ethernet
+# XXX uses vtophys()
+#lmc*	at pci? dev ? function ?	# Lan Media Corp SSI/HSSI/DS3
+ne*	at pci? dev ? function ?	# NE2000-compatible Ethernet UT
+ntwoc*	at pci? dev ? function ?	# Riscom/N2 PCI Sync Serial UT
+# XXX cause uncorrectable DMA error
+#pcn*	at pci? dev ? function ?	# PCnet-PCI Ethernet
+ral*	at pci? dev ? function ?	# ralink wifi UT
+re*	at pci? dev ? function ?	# Realtek 8139C+/8169/8169S/8110S
+rtk*	at pci? dev ? function ?	# Realtek 8129/8139
+sip*	at pci? dev ? function ?	# SiS 900 Ethernet
+ti*	at pci? dev ? function ?	# Alteon ACEnic gigabit Ethernet UT
+tl*	at pci? dev ? function ?	# ThunderLAN-based Ethernet
+tlp*	at pci? dev ? function ?	# DECchip 21x4x and clones
+vr*	at pci? dev ? function ?	# VIA Rhine Fast Ethernet
+wi*	at pci? dev ? function ?	# Lucent/Intersil WaveLAN/IEEE
+wm*	at pci? dev ? function ?	# Intel 8254x gigabit
+
+# MII/PHY support
+# XXX: only nsphy and igphy "tested"
+acphy*	at mii? phy ?			# Altima AC101 and AMD Am79c874 PHYs
+dmphy*	at mii? phy ?			# Davicom DM9101 PHYs
+exphy*	at mii? phy ?			# 3Com internal PHYs
+icsphy*	at mii? phy ?			# Integrated Circuit Systems ICS189x
+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
+makphy* at mii? phy ?			# Marvell Semiconductor 88E1000 PHYs
+nsphy*	at mii? phy ?			# NS83840 PHYs
+nsphyter* at mii? phy ?			# NS83843 PHYs
+qsphy*	at mii? phy ?			# Quality Semiconductor QS6612 PHYs
+sqphy*	at mii? phy ?			# Seeq 80220/80221/80223 PHYs
+tlphy*	at mii? phy ?			# ThunderLAN PHYs
+tqphy*	at mii? phy ?			# TDK Semiconductor PHYs
+ukphy*	at mii? phy ?			# generic unknown PHYs
+
+# 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)
+
+# USB bus support
+usb*	at ehci?
+usb*	at ohci?
+usb*	at uhci?
+#usb*	at slhci?
+
+# USB Hubs
+uhub*	at usb?
+uhub*	at uhub? port ? configuration ? interface ?
+
+# USB HID device
+uhidev*	at uhub? port ? configuration ? interface ?
+
+# USB Mice
+ums*	at uhidev? reportid ?
+wsmouse* at ums? mux 0
+
+# USB eGalax touch-panel
+uep*	at uhub? port ?
+wsmouse* at uep? mux 0
+
+# USB Keyboards
+ukbd*	at uhidev? reportid ?
+wskbd*	at ukbd? console ? mux 1
+
+# USB serial adpater
+ucycom*	at uhidev? reportid ?
+
+# USB Generic HID devices
+uhid*	at uhidev? reportid ?
+
+# USB Printer
+ulpt*	at uhub? port ? configuration ? interface ?
+
+# USB Modem
+umodem*	at uhub? port ? configuration ?
+ucom*	at umodem?
+
+# USB Mass Storage
+umass*	at uhub? port ? configuration ? interface ?
+scsibus* at umass?
+wd*	at umass?
+
+# USB audio
+uaudio*	at uhub? port ? configuration ?
+
+# USB MIDI
+umidi* at uhub? port ? configuration ?
+
+# USB IrDA
+# USB-IrDA bridge spec
+uirda* at uhub? port ? configuration ? interface ?
+irframe* at uirda?
+
+# SigmaTel STIr4200 USB/IrDA Bridge
+ustir* at uhub? port ?
+irframe* at ustir?
+
+# USB Ethernet adapters
+aue*	at uhub? port ?		# ADMtek AN986 Pegasus based adapters
+axe*	at uhub? port ?		# ASIX AX88172 based adapters
+cdce*	at uhub? port ?		# CDC, Ethernet Networking Control Model
+cue*	at uhub? port ?		# CATC USB-EL1201A based adapters
+kue*	at uhub? port ?		# Kawasaki LSI KL5KUSB101B based adapters
+udav*	at uhub? port ?		# Davicom DM9601 based adapters
+url*	at uhub? port ?		# Realtek RTL8150L based adapters
+
+# USB 802.11 adapters
+atu*	at uhub? port ?		# Atmel AT76C50XX based adapters
+ral*	at uhub? port ?		# Ralink Technology RT25x0 802.11a/b/g
+
+# Prolific PL2301/PL2302 host-to-host adapter
+upl*	at uhub? port ?
+
+# Serial adapters
+ubsa*	at uhub? port ?		# Belkin serial adapter
+ucom*	at ubsa? portno ?
+
+uftdi*	at uhub? port ?		# FTDI FT8U100AX serial adapter
+ucom*	at uftdi? portno ?
+
+umct*	at uhub? port ?		# MCT USB-RS232 serial adapter
+ucom*	at umct? portno ?
+
+uplcom* at uhub? port ? 	# I/O DATA USB-RSAQ2 serial adapter
+ucom*	at uplcom? portno ?
+
+uvscom* at uhub? port ? 	# SUNTAC Slipper U VS-10U serial adapter
+ucom*	at uvscom? portno ?
+
+# Diamond Multimedia Rio 500
+urio*	at uhub? port ?
+
+# USB Handspring Visor
+uvisor*	at uhub? port ?
+ucom*	at uvisor?
+
+# Kyocera AIR-EDGE PHONE
+ukyopon* at uhub? port ?
+ucom*	at ukyopon? portno ?
+
+# USB scanners
+uscanner* at uhub? port ?
+
+# USB scanners that use SCSI emulation, e.g., HP5300
+usscanner* at uhub? port ?
+
+# Y@P firmware loader
+uyap* at uhub? port ?
+
+# D-Link DSB-R100 USB radio
+udsbr*	at uhub? port ?
+radio*	at udsbr?
+
+# USB Generic driver
+ugen*	at uhub? port ?
+
+## Loopback network interface; required
+pseudo-device	loop
+
+## SLIP and CSLIP interfaces, for IP over a serial line.
+pseudo-device	sl		
+
+## PPP, the successor to SLIP.  See pppd(8).
+pseudo-device	ppp		
+
+## PPP over Ethernet (RFC 2516)
+pseudo-device	pppoe
+
+## Starmode Radio IP, a special hardware network device.
+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	tap			# virtual Ethernet
+
+## Generic L3 over IP tunnel
+#pseudo-device	gre			# generic L3 over IP tunnel
+
+## Berkeley Packet Filter, required to run RARPD.  A generic C-language
+## interface that allows selective examining of incoming packets.
+pseudo-device	bpfilter
+
+## IEEE 802.1q encapsulation
+pseudo-device	vlan
+
+## Simple inter-network traffic bridging
+pseudo-device	bridge
+#options 	BRIDGE_IPF		# bridge uses IP/IPv6 pfil hooks too
+
+## IP Filter, used in firewall and NAT applications.  See ipnat(8) for
+## one example of the use of the IP Filter.
+pseudo-device	ipfilter
+
+## for IPv6
+pseudo-device	gif			# IPv[46] over IPv[46] tunnel (RFC1933)
+#pseudo-device	faith			# IPv[46] tcp relay translation i/f
+pseudo-device	stf			# 6to4 IPv6 over IPv4 encapsulation
+
+
+#### CardBus and PCMCIA devices
+
+# PCI CardBus bridge support
+#cbb*	at pci? dev ? function ?
+#cardslot* at cbb?
+
+# CardBus bus support
+#cardbus* at cardslot?
+#pcmcia* at cardslot?
+
+## SBus to PCMCIA bridge
+#nell*	at sbus? slot ? offset ?		# PCMCIA bridge
+#pcmcia*	at nell?
+
+## CardBus cards; UT marks untested.
+
+# CardBus serial interfaces
+#com*	at cardbus? function ?	# Modems and serial cards UT
+
+# CardBus SCSI controllers
+#adv*	at cardbus? function ?	# AdvanSys 1200[A,B], 9xx[U,UA] SCSI UT
+#ahc*	at cardbus? function ?	# Adaptec ADP-1480 UT
+#njs*	at cardbus? function ?	# Workbit NinjaSCSI-32
+
+# CardBus network interfaces
+#ath*	at cardbus? function ?	# Atheros 5210/5211/5212 802.11
+#atw*	at cardbus? function ?	# ADMtek ADM8211 (802.11) UT
+#ex*	at cardbus? function ?	# 3Com 3C575TX
+#fxp*	at cardbus? function ?	# Intel i8255x UT
+#ral*	at cardbus? function ?	# Ralink Technology RT25x0 802.11a/b/g UT
+#rtk*	at cardbus? function ?	# Realtek 8129/8139 UT
+#tlp*	at cardbus? function ?	# DECchip 21143
+
+# CardBus USB controllers
+#ehci*	at cardbus? function ?	# Enhanced Host Controller
+#ohci*	at cardbus? function ?	# Open Host Controller
+
+## PCMCIA cards; UT marks untested.
+
+# PCMCIA serial interfaces
+#com*	at pcmcia? function ?		# Modems and serial cards
+
+#pcmcom* at pcmcia? function ?		# PCMCIA multi-port serial cards UT
+#com*	at pcmcom? slave ?		# ...and the slave devices
+
+# PCMCIA SCSI controllers
+#aic*	at pcmcia? function ?		# Adaptec APA-1460 SCSI UT
+#esp*	at pcmcia? function ?		# Qlogic ESP406/FAS408 SCSI UT
+
+# PCMCIA IDE controllers
+#wdc*	at pcmcia? function ?
+
+# PCMCIA network interfaces
+#an*	at pcmcia? function ?		# Aironet PC4500/PC4800 (802.11) UT
+#awi*	at pcmcia? function ?		# BayStack 650/660 (802.11FH/DS) UT
+#cnw*	at pcmcia? function ?		# Xircom/Netwave AirSurfer UT
+#cs*	at pcmcia? function ?		# CS89xx Ethernet UT
+#ep*	at pcmcia? function ?		# 3Com 3c589 and 3c562 Ethernet
+#mbe*	at pcmcia? function ?		# MB8696x based Ethernet UT
+#ne*	at pcmcia? function ?		# NE2000-compatible Ethernet
+#ray*	at pcmcia? function ?		# Raytheon Raylink (802.11) UT
+#sm*	at pcmcia? function ?		# Megahertz Ethernet UT
+# tr at pcmcia has problems with Cardbus bridges
+#tr*	at pcmcia? function ?		# TROPIC based Token-Ring UT
+#wi*	at pcmcia? function ?		# Lucent/Intersil WaveLan IEEE (802.11)
+#xirc*	at pcmcia? function ?		# Xircom CreditCard Ethernet UT
+#com*	at xirc?
+#xi*	at xirc?
+#mhzc*	at pcmcia? function ?		# Megahertz Ethernet/Modem combo cards
+#com*	at mhzc?
+#sm*	at mhzc?
+
+# PCMCIA audio devices
+#esl*	at pcmcia? function ?			# ESS 1688 AudioDrive UT
+
+#### Audio and video devices
+
+## /dev/audio support (`audiocs' plus `audio')
+##
+audiocs*	at sbus? slot ? offset ?	# SUNW,CS4231
+audiocs*	at ebus?			# SUNW,CS4231 in U5/U10
+autri*		at pci? dev ? function ?	# Blade 100 'sound'
+
+audio*		at audiobus?
+
+#midi*		at midibus?
+
+
+## Sun "bwtwo" black and white framebuffer, found on sun4, sun4c, and sun4m
+## systems.  If your sun4 system has a cgfour installed in the P4 slot,
+## the P4 entries for "bwtwo" will attach to the overlay plane of the
+## "cgfour".
+
+#bwtwo0		at sbus? slot ? offset ?	# sun4c and sun4m
+#bwtwo*		at sbus? slot ? offset ?
+
+## Sun "cgthree" Sbus color framebuffer
+#cgthree0	at sbus? slot ? offset ?
+#cgthree*	at sbus? slot ? offset ?
+
+## Sun "cgsix" accelerated color framebuffer.
+cgsix*		at sbus? slot ? offset ?
+
+## Sun FFB
+ffb*		at mainbus0
+
+# On board vga on U5/U10 etc.
+machfb*		at pci?
+
+# make sure the console display is always wsdisplay0
+wsdisplay0	at wsemuldisplaydev? console 1
+wsdisplay*	at wsemuldisplaydev?
+
+# wsmouse for sun ms
+wsmouse*        at ms0
+
+# wskbd for sun kbd
+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 	WS_DEFAULT_FG=WSCOL_BLACK
+options 	WS_DEFAULT_BG=WSCOL_LIGHT_WHITE
+options 	WSDISPLAY_COMPAT_USL		# VT handling
+options 	WSDISPLAY_COMPAT_RAWKBD		# can get raw scancodes
+options 	WSDISPLAY_DEFAULTSCREENS=4
+options 	FONT_GALLANT12x22		# PROM font look-alike
+
+#### Other device configuration
+
+### Other pseudo-devices
+
+pseudo-device 	crypto			# /dev/crypto device
+pseudo-device	swcrypto		# software crypto implementation
+
+## Pseudo ttys, required for network logins and programs like screen.
+
+pseudo-device	pty			# pseudo-ttys (for network, etc.)
+
+## Random device, used to implement /dev/random (a source of random noise),
+## and generate randomness for some kernel formulae.
+
+pseudo-device	rnd
+
+pseudo-device	wsmux			# mouse & keyboard multiplexor
+pseudo-device	wsfont
+pseudo-device	clockctl		# user control of clock subsystem
+pseudo-device	ksyms			# /dev/ksyms
+#pseudo-device	pf			# PF packet filter
+#pseudo-device	pflog			# PF log if
+pseudo-device	fss		4	# file system snapshot device
+
+# Veriexec
+#options VERIFIED_EXEC
+#
+# a pseudo device needed for veriexec
+#pseudo-device	veriexec		1
+#
+# Uncomment the fingerprint methods below that are desired. Note that
+# 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
+
+# a pseudo device needed for SMBFS
+pseudo-device   nsmb		# experimental - SMB requester
Index: GENERIC.MP
===================================================================
RCS file: /cvsroot/src/sys/arch/sparc64/conf/GENERIC.MP,v
retrieving revision 1.2
diff -u -r1.2 GENERIC.MP
--- GENERIC.MP	11 Dec 2005 12:19:08 -0000	1.2
+++ GENERIC.MP	28 Jun 2006 18:01:27 -0000
@@ -3,21 +3,9 @@
 # GENERIC Sparc64 kernel configuration with multiprocessor support.
 #
 
-include 	"arch/sparc64/conf/GENERIC32"
+include 	"arch/sparc64/conf/GENERIC"
 
 #ident 	"GENERIC.MP-$Revision: 1.2 $"
 
-include 	"arch/sparc64/conf/std.sparc64-64"
-
 options 	MULTIPROCESSOR		# include multiprocessor support
 cpu* 		at mainbus0		# declare additional CPUs
-
-options 	COMPAT_NETBSD32		# NetBSD/sparc binary compatibility
-options 	COMPAT_SVR4_32		# SunOS 5.x 32-bit binary compatibility
-
-# DEBUG options
-#options 	LOCKDEBUG
-#options 	DIAGNOSTIC
-#makeoptions	DEBUG="-g"
-#options 	DEBUG
-#options 	SYSCALL_DEBUG
Index: GENERIC32
===================================================================
RCS file: /cvsroot/src/sys/arch/sparc64/conf/GENERIC32,v
retrieving revision 1.138
diff -u -r1.138 GENERIC32
--- GENERIC32	5 Jun 2006 05:14:38 -0000	1.138
+++ GENERIC32	28 Jun 2006 18:01:27 -0000
@@ -1,852 +1,13 @@
-# 	$NetBSD: GENERIC32,v 1.138 2006/06/05 05:14:38 gdamore Exp $
-
-include "arch/sparc64/conf/std.sparc64"
-
-options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
-
-#ident 		"GENERIC-$Revision: 1.138 $"
-
-maxusers	64
-
-## System kernel configuration.  See options(4) for more detail.
-
-
-# Options for variants of the Sun SPARC architecure.
-# We currently support three architecture types; at least one is required.
-options 	SUN4U		# sun4u - UltraSPARC
-#options 	BLINK		# blink the system LED
-
-#### System options that are the same for all ports
-
-## Root device configuration: change the ?'s if you are going to use a
-## nonstandard root partition (other than where the kernel is booted from)
-## and/or nonstandard root type (not ffs or nfs).  Normally this can be
-## automagically determined at boot time.
-
-config		netbsd	root on ? type ?
-
-## UVM options.
-#options 	UVM_PAGE_TRKOWN
-#options 	UVMHIST
-#options 	UVMHIST_PRINT	# Loud!
-
-## System call tracing (see ktrace(1)).
-options 	KTRACE
-options 	SYSTRACE		# system call vetting via systrace(1)
-
-## Collect statistics on kernel malloc's and free's.  This does have a
-## significant performance hit on slower machines, so it is intended for
-## diagnostic use only.
-#options 	KMEMSTATS
-
-## System V compatible IPC subsystem.  (msgctl(2), semctl(2), and shmctl(2))
-options 	SYSVMSG		# System V message queues
-options 	SYSVSEM		# System V semaphores
-options 	SYSVSHM		# System V shared memory
-#options 	SHMMAXPGS=1024	# 1024 pages is the default
-options 	P1003_1B_SEMAPHORE	# p1003.1b semaphore support 
-
-
-## Loadable kernel module support; still under development.
-options 	LKM
-
-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 
-# high disk I/O load. Use it with caution - it's not proven to be stable yet.
-#options 	BUFQ_READPRIO
-#options 	BUFQ_PRIOCSCAN
-
-## NFS boot options; tries DHCP/BOOTP then BOOTPARAM
-options 	NFS_BOOT_BOOTPARAM
-#options 	NFS_BOOT_BOOTP
-options 	NFS_BOOT_DHCP
-
-#### Debugging options
-
-## The DDB in-kernel debugger runs at panic (unless DDB_ONPANIC=0), or at
-## serial console break or keyboard reset, where the PROM would normally
-## intercept.  DDB_HISTORY_SIZE adds up/down arrow command history.
-# we enable DDB in GENERIC for now.
-options 	DDB			# kernel dynamic debugger
-options 	DDB_HISTORY_SIZE=100	# enable history editing in DDB
-#options 	DDB_ONPANIC		# see also sysctl(8): `ddb.onpanic'
-
-## You may also use gdb, on another computer connected to this machine over
-## a serial port.
-# ttyb on an Ultra5 is aliased to: "/pci@1f,0/pci@1,1/ebus@1/se:b", which is
-# "/pci@1f,0/pci@1,1/ebus@1/se@14,400000", port b.
-# options 	KGDB			# support for kernel gdb
-# options 	KGDB_DEVNAME="\"sab\""	# driver name for the kgdb serial chip
-# options 	KGDB_DEVADDR=0x400000	# physical address of the chip
-# options 	KGDB_DEVPORT=1		# port b
-# options 	KGDB_DEVRATE=38400	# baud rate
-
-
-## Compile the kernel with debugging symbols (`netbsd.gdb' is the debug file),
-## such that gdb(1) can be used on a kernel coredump.
-
-#makeoptions	DEBUG="-g"
-
-
-## Adds code to the kernel that does internal consistency checks, and will
-## cause the kernel to panic if corruption of internal data structures
-## is detected.
-#options 	DIAGNOSTIC	# extra kernel sanity checking
-
-## Enable (possibly expensive) debugging code that may also display messages
-## on the system console
-#options 	DEBUG
-
-## Make SCSI error messages more verbose when explaining their meanings.
-options 	SCSIVERBOSE
-options 	PCIVERBOSE
-options 	MIIVERBOSE	# verbose PHY autoconfig messages
-#options 	PCI_CONFIG_DUMP	# verbosely dump PCI config space
-
-## `INSECURE' turns off the kernel security level (securelevel = 0 always).
-## This allows writing to /dev/mem, loading kernel modules while multi-user,
-## and other insecurities good only for development work.  Do not use this
-## option on a production machine.
-#options 	INSECURE
-
-## `FDSCRIPTS' allows non-readable but executable scripts by providing a
-## pre-opened opaque file to the script interpreter.  `SETUIDSCRIPTS',
-## which implies FDSCRIPTS, allows scripts to be set-user-id using the same
-## opaque file mechanism.  Perl calls this "secure setuid scripts."
-
-#options 	FDSCRIPTS
-#options 	SETUIDSCRIPTS
-
-## Options for compatibility with previous releases foreign system binaries.
-## In the cases of COMPAT_SUNOS and COMPAT_SVR4, you may need to set up
-## additional user-level utilities or system configuration files. See
-## compat_sunos(8) and compat_svr4(8).
-
-options 	COMPAT_43	# 4.3BSD system interfaces
-options 	COMPAT_09	# NetBSD 0.9 binary compatibility
-options 	COMPAT_10	# NetBSD 1.0 binary compatibility
-options 	COMPAT_11	# NetBSD 1.1 binary compatibility
-options 	COMPAT_12	# NetBSD 1.2 binary compatibility
-options 	COMPAT_13	# NetBSD 1.3 binary compatibility
-options 	COMPAT_14	# NetBSD 1.4 binary compatibility
-options 	COMPAT_15	# NetBSD 1.5 binary compatibility
-options 	COMPAT_16	# NetBSD 1.6 binary compatibility
-options 	COMPAT_20	# NetBSD 2.0 binary compatibility
-options 	COMPAT_30	# NetBSD 3.0 binary compatibility
-options 	COMPAT_SUNOS	# SunOS 4.x binary compatibility
-options 	COMPAT_SVR4	# SunOS 5.x binary compatibility
-#options 	COMPAT_SVR4_32	# SunOS 5.x 32-bit binary compatibility -- 64-bit only
-#options 	COMPAT_NETBSD32	# NetBSD/sparc binary compatibility -- 64-bit only
-options 	EXEC_AOUT	# execve(2) support for a.out binaries
-options 	EXEC_ELF32	# Exec module for SunOS 5.x binaries.
-#options 	SYSCALL_DEBUG
-
-#options 	TCP_COMPAT_42	# 4.2BSD TCP/IP bug compat. Not recommended.
-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	MFS		# memory-based filesystem
-file-system	FDESC		# user file descriptor filesystem
-file-system	UMAPFS		# uid/gid remapping filesystem
-file-system	LFS		# Log-based filesystem (still experimental)
-file-system	PORTAL		# portal filesystem (still experimental)
-file-system	PROCFS		# /proc
-file-system	CD9660		# ISO 9660 + Rock Ridge file system
-file-system	UNION		# union file system
-file-system	MSDOSFS		# MS-DOS FAT filesystem(s).
-file-system	PTYFS		# /dev/pts/N support
-file-system	SMBFS		# experimental - CIFS; also needs nsmb (below)
-#file-system	TMPFS		# experimental - Efficient memory file-system
-#file-system	UDF		# experimental - OSTA UDF CD/DVD file-system
-
-## File system options.
-options 	NFSSERVER	# Sun NFS-compatible filesystem server
-options 	QUOTA		# FFS quotas
-#options 	FFS_EI		# FFS Endian Independent support
-options 	SOFTDEP		# FFS soft updates support.
-#options 	FFS_NO_SNAPSHOT	# No FFS snapshot support
-
-## Network protocol support.  In most environments, INET is required.
-options 	INET		# IP (Internet Protocol) v4
-options 	INET6		# IPV6
-#options 	IPSEC		# IP security
-#options 	IPSEC_ESP	# IP security (encryption part; define w/IPSEC)
-#options 	IPSEC_NAT_T	# IPsec NAT traversal (NAT-T)
-#options 	IPSEC_DEBUG	# debug for IP security
-#options 	GATEWAY		# packet forwarding ("router switch")
-options 	MROUTING	# packet forwarding of multicast packets
-options 	PIM		# Protocol Independent Multicast
-#options 	DIRECTED_BROADCAST	# allow broadcasts through routers
-options 	NS		# Xerox NS networking
-#options 	NSIP		# Xerox NS tunneling over IP
-options 	ISO,TPIP	# OSI networking
-options 	EON		# OSI tunneling over IP
-#options 	CCITT,LLC,HDLC	# X.25 packet switched protocol
-options 	NETATALK	# AppleTalk (over Ethernet) protocol
-options 	NTP		# Network Time Protocol in-kernel support
-#options 	PPS_SYNC	# Add serial line synchronization for NTP
-options 	PFIL_HOOKS	# Add pfil(9) hooks, intended for custom LKMs.
-options 	IPFILTER_LOG	# Add ipmon(8) logging for ipfilter device
-#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
-options 	PPP_FILTER	# Add active filters for ppp (via bpf)
-#options 	TCP_DEBUG	# Record last TCP_NDEBUG packets with SO_DEBUG
-
-#options 	ALTQ		# Manipulate network interfaces' output queues
-#options 	ALTQ_BLUE	# Stochastic Fair Blue
-#options 	ALTQ_CBQ	# Class-Based Queueing
-#options 	ALTQ_CDNR	# Diffserv Traffic Conditioner
-#options 	ALTQ_FIFOQ	# First-In First-Out Queue
-#options 	ALTQ_FLOWVALVE	# RED/flow-valve (red-penalty-box)
-#options 	ALTQ_HFSC	# Hierarchical Fair Service Curve
-#options 	ALTQ_LOCALQ	# Local queueing discipline
-#options 	ALTQ_PRIQ	# Priority Queueing
-#options 	ALTQ_RED	# Random Early Detection
-#options 	ALTQ_RIO	# RED with IN/OUT
-#options 	ALTQ_WFQ	# Weighted Fair Queueing
-
-
-#### Main bus and CPU .. all systems.
-mainbus0 at root
-cpu0	at mainbus0
-
-#### Bus types found on SPARC systems.
-
-sbus*	at mainbus0				# SBus-based systems
-psycho*	at mainbus0				# PCI-based systems
-pci*	at psycho?
-pci*	at ppb?
-ppb*	at pci?					# `APB' support.
-ebus*	at pci?					# ebus devices
-# XXX 'puc's aren't really bridges, but there's no better place for them here
-puc*	at pci? dev ? function ?		# PCI "universal" comm. cards
-
-#### Standard system devices -- all required for a given architecture
-
-## PROM console driver -- if all else fails
-pcons0	at mainbus0				# PROM console
-
-## Auxiliary system registers -- We use the OBP for power management
-auxio*	at ebus?				# auxio registers
-auxio*	at sbus? slot ? offset ?		# auxio registers
-
-# We also need:
-bpp*	at sbus? slot ? offset ?		# parallel port
-lpt*	at ebus?				# parallel port
-
-## Mostek clock found on 4/300, sun4c, sun4m and sun4u systems.
-## The Mostek clock NVRAM is the "eeprom" on sun4/300 systems.
-clock*	at sbus? slot ? offset ?
-clock*	at ebus?
-rtc*	at ebus?
-
-## Timer chip found on 4/300, sun4c, sun4m and (some) sun4u systems.
-timer*	at mainbus0				# sun4c
-
-#### Serial port configuration
-
-## Zilog 8530 serial chips.  Each has two-channels.
-## zs0 is ttya and ttyb.  zs1 is the keyboard and mouse.
-zs*	at sbus? slot ? offset ?
-zstty*	at zs? channel ?			# ttya
-kbd0	at zstty?
-ms0	at zstty?
-
-## PCI machines have serial ports:
-##	Siemens SAB82532 controller: ttya and ttyb (`su'; sab)
-##	Part of NS PC87332VLJ Super I/O controller: kbd/mouse (`se'; com)
-
-## The SAB82532 controller has two serial ports
-sab*	at ebus?				# ttya/ttyb
-sabtty*	at sab? channel ?
-
-## Part of a PC87332VLJ
-com*	at ebus?				# `com' driver for `su'
-kbd0	at com?					# keyboard
-ms0	at com?					# mouse
-
-## Magma Serial/Parallel driver (not tested)
-#magma*	at sbus? slot ? offset ?
-#mtty*	at magma?
-#mbpp*	at magma?
-
-## SUNW,spif Serial/Parallel driver (not tested)
-#spif*  at sbus? slot ? offset ?
-#stty*  at spif?
-#sbpp*  at spif?
-
-## PCI serial interfaces
-com*	at puc? port ?			# 16x50s on "universal" comm boards
-cy*	at pci? dev ? function ?	# Cyclades Cyclom-Y serial boards
-cz*	at pci? dev ? function ?	# Cyclades-Z multi-port serial boards
-
-
-#### Disk controllers and disks
-
-## The following flags may be set for the NCR53c94 based esp driver:
-##	bits 0-7:  disable disconnect/reselect for the corresponding target
-##	bits 8-15: disable synchronous negotiation for target [bit-8]
-##	bits 16-23: disable tagged queuing for target [bit-16]
-
-## sun4u on-board SCSI, and FSBE/S SBus SCSI cards, an NCR53c94 or
-## equivalent behind an LSI Logic DMA controller
-
-dma*	at sbus? slot ? offset ?		# SBus
-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)
-
-# PCI cryptographic devices
-hifn*	at pci? dev ? function ?	# Hifn 7755/7811/795x
-ubsec*	at pci? dev ? function ?	# Broadcom 5501/5601/580x/582x
-
-# PCI SCSI controllers
-# 	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
-bha*	at pci? dev ? function ?	# BusLogic 9xx SCSI UT
-dpt*	at pci? dev ? function ?	# DPT SmartCache/SmartRAID UT
-iha*	at pci? dev ? function ?	# Initio INIC-940/950 SCSI
-njs*	at pci? dev ? function ?	# Workbit NinjaSCSI-32
-pcscp*	at pci? dev ? function ?	# AMD 53c974 PCscsi-PCI SCSI
-trm*	at pci? dev ? function ?	# Tekram DC-395U/UW/F, DC-315/U SCSI
-
-scsibus* at scsi?
-
-## These entries find devices on all SCSI busses and assign
-## unit numbers dynamically.
-sd*	at scsibus? target ? lun ?		# SCSI disks
-st*	at scsibus? target ? lun ?		# SCSI tapes
-cd*	at scsibus? target ? lun ?		# SCSI CD-ROMs
-ch*	at scsibus? target ? lun ?		# SCSI changer devices
-ss*	at scsibus? target ? lun ?		# SCSI scanners
-ses*	at scsibus? target ? lun ?		# SCSI SES/SAF-TE devices
-uk*	at scsibus? target ? lun ?		# unknown SCSI
-
-# IDE and related devices
-# PCI IDE controllers - see pciide(4) for supported hardware.
-# The 0x0001 flag force the driver to use DMA, even if the driver doesn't know
-# how to set up DMA modes for this chip. This may work, or may cause
-# a machine hang with some controllers.
-pciide* at pci? dev ? function ? flags 0x0000	# GENERIC pciide driver
-acardide* at pci? dev ? function ?	# Acard IDE controllers
-aceride* at pci? dev ? function ?	# Acer Lab IDE controllers
-artsata* at pci? dev ? function ?	# Intel i31244 SATA controller
-cmdide* at pci? dev ? function ?	# CMD tech IDE controllers
-cypide* at pci? dev ? function ?	# Cypress IDE controllers
-hptide* at pci? dev ? function ?	# Triones/HighPoint IDE controllers
-optiide* at pci? dev ? function ?	# Opti IDE controllers
-pdcide* at pci? dev ? function ?	# Promise IDE controllers
-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
-viaide* at pci? dev ? function ?	# VIA/AMD/Nvidia IDE controllers
-
-# ATA (IDE) bus support
-atabus* at ata?
-atapibus* at atapi?
-
-# IDE drives
-# Flags are used only with controllers that support DMA operations
-# and mode settings (e.g. some pciide controllers)
-# The lowest order four bits (rightmost digit) of the flags define the PIO
-# mode to use, the next set of four bits the DMA mode and the third set the
-# UltraDMA mode. For each set of four bits, the 3 lower bits define the mode
-# to use, and the last bit must be 1 for this setting to be used.
-# For DMA and UDMA, 0xf (1111) means 'disable'.
-# 0x0fac means 'use PIO mode 4, DMA mode 2, disable UltraDMA'.
-# (0xc=1100, 0xa=1010, 0xf=1111)
-# 0x0000 means "use whatever the drive claims to support".
-
-## Disable UDMA 4 which causes data corruption on the Acer Labs
-## chipset on Sun Blade 100 and Netra X1 machines.
-wd*     at atabus? drive ? flags 0x0000
-
-cd*	at atapibus? drive ? flags 0x0000	# ATAPI CD-ROM drives
-sd*	at atapibus? drive ? flags 0x0000	# ATAPI disk drives
-uk*	at atapibus? drive ? flags 0x0000	# ATAPI unknown
-
-# RAID controllers and devices (untested)
-cac*	at pci? dev ? function ?	# Compaq PCI array controllers
-mlx*	at pci? dev ? function ?	# Mylex DAC960 & DEC SWXCR family
-twe*	at pci? dev ? function ?	# 3ware Escalade RAID controllers
-
-ld*	at cac? unit ?			# logical disk devices
-ld*	at twe? unit ?
-ld*	at mlx? unit ?
-
-## Floppy controller and drive found on SPARCstations.
-
-# need share with the sparc, and everyone else.  needs to use auxio.
-# actually, the ebus version has (will have) direct access to it's AUXIO
-# register space (it is mapped in to fdthree not auxio).
-#fdc0	at sbus? slot ? offset ?		# SUNW,fdtwo
-#fdc0	at ebus?				# fdthree
-#fd*	at fdc0 	 			# the drive itself
-
-## A disk-like interface to files.  Can be used to create floppy, CD,
-## miniroot images, etc.
-
-pseudo-device	vnd	
-#options 	VND_COMPRESSION		# compressed vnd(4)
-
-## Concatenated and striped disks; with this, you can create a software-based
-## disk array similar to a "RAID 0" setup.  See ccd(4).
-
-pseudo-device	ccd	4
-
-## Cryptographic disk devices.  See cgd(4).
-
-#pseudo-device	cgd	4
-
-## RAIDframe disk driver: software RAID driver.  See raid(4).
-
-pseudo-device	raid	8
-options 	RAID_AUTOCONFIG		# auto-configuration of RAID components
-# Options to enable various other RAIDframe RAID types.
-# options 	RF_INCLUDE_EVENODD=1
-# options 	RF_INCLUDE_RAID5_RS=1
-# options 	RF_INCLUDE_PARITYLOGGING=1
-# options 	RF_INCLUDE_CHAINDECLUSTER=1
-# options 	RF_INCLUDE_INTERDECLUSTER=1
-# options 	RF_INCLUDE_PARITY_DECLUSTERING=1
-# options 	RF_INCLUDE_PARITY_DECLUSTERING_DS=1
-
-
-## Memory disk device, used on boot floppies with compressed
-## kernel-plus-root-disk images.
-
-pseudo-device	md	1
-
-
-#### Network interfaces
-
-## LANCE Ethernet - an AMD 7990 LANCE behind specialized DMA glue
-## Three flavors of additional SBus ethernets are available.  One attaches
-## directly like the sun4c on-board, one uses the ledma device like the
-## sun4m on-board, and one uses the lebuffer device.
-
-ledma0		at sbus? slot ? offset ?	# sun4m on-board
-le0		at ledma0			# sun4m on-board
-le*		at sbus? slot ? offset ?	# SBus
-ledma*		at sbus? slot ? offset ?	# SBus
-le*		at ledma?			# SBus
-lebuffer0	at sbus? slot ? offset ?	# SBus
-le0		at lebuffer?			# SBus
-lebuffer*	at sbus? slot ? offset ?	# SBus
-le*		at lebuffer?			# SBus
-
-## Happy Meal Ethernet
-hme*		at sbus? slot ? offset ?
-hme*		at pci?	dev ? function ?	# network "hme" compatible
-
-## qec/be, qec/hme
-qec*		at sbus? slot ? offset ?
-be*		at qec?
-qe*		at qec?
-
-# PCI network interfaces
-# 	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
-en*	at pci? dev ? function ?	# ENI/Adaptec ATM UT
-# XXX causes ICE
-#ep*	at pci? dev ? function ?	# 3Com 3c59x
-ex*	at pci? dev ? function ?	# 3Com 90x[B]
-epic*	at pci? dev ? function ?	# SMC EPIC/100 Ethernet
-esh*	at pci? dev ? function ?	# Essential HIPPI card UT
-fpa*	at pci? dev ? function ?	# DEC DEFPA FDDI UT
-fxp*	at pci? dev ? function ?	# Intel EtherExpress PRO 10+/100B
-gem*	at pci? dev ? function ?	# Apple GMAC and Sun ERI gigabit enet
-# XXX lacks bus_dmamap_sync()
-#le*	at pci? dev ? function ?	# PCnet-PCI Ethernet
-# XXX uses vtophys()
-#lmc*	at pci? dev ? function ?	# Lan Media Corp SSI/HSSI/DS3
-ne*	at pci? dev ? function ?	# NE2000-compatible Ethernet UT
-ntwoc*	at pci? dev ? function ?	# Riscom/N2 PCI Sync Serial UT
-# XXX cause uncorrectable DMA error
-#pcn*	at pci? dev ? function ?	# PCnet-PCI Ethernet
-ral*	at pci? dev ? function ?	# ralink wifi UT
-re*	at pci? dev ? function ?	# Realtek 8139C+/8169/8169S/8110S
-rtk*	at pci? dev ? function ?	# Realtek 8129/8139
-sip*	at pci? dev ? function ?	# SiS 900 Ethernet
-ti*	at pci? dev ? function ?	# Alteon ACEnic gigabit Ethernet UT
-tl*	at pci? dev ? function ?	# ThunderLAN-based Ethernet
-tlp*	at pci? dev ? function ?	# DECchip 21x4x and clones
-vr*	at pci? dev ? function ?	# VIA Rhine Fast Ethernet
-wi*	at pci? dev ? function ?	# Lucent/Intersil WaveLAN/IEEE
-wm*	at pci? dev ? function ?	# Intel 8254x gigabit
-
-# MII/PHY support
-# XXX: only nsphy and igphy "tested"
-acphy*	at mii? phy ?			# Altima AC101 and AMD Am79c874 PHYs
-dmphy*	at mii? phy ?			# Davicom DM9101 PHYs
-exphy*	at mii? phy ?			# 3Com internal PHYs
-icsphy*	at mii? phy ?			# Integrated Circuit Systems ICS189x
-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
-makphy* at mii? phy ?			# Marvell Semiconductor 88E1000 PHYs
-nsphy*	at mii? phy ?			# NS83840 PHYs
-nsphyter* at mii? phy ?			# NS83843 PHYs
-qsphy*	at mii? phy ?			# Quality Semiconductor QS6612 PHYs
-sqphy*	at mii? phy ?			# Seeq 80220/80221/80223 PHYs
-tlphy*	at mii? phy ?			# ThunderLAN PHYs
-tqphy*	at mii? phy ?			# TDK Semiconductor PHYs
-ukphy*	at mii? phy ?			# generic unknown PHYs
-
-# 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)
-
-# USB bus support
-usb*	at ehci?
-usb*	at ohci?
-usb*	at uhci?
-#usb*	at slhci?
-
-# USB Hubs
-uhub*	at usb?
-uhub*	at uhub? port ? configuration ? interface ?
-
-# USB HID device
-uhidev*	at uhub? port ? configuration ? interface ?
-
-# USB Mice
-ums*	at uhidev? reportid ?
-wsmouse* at ums? mux 0
-
-# USB eGalax touch-panel
-uep*	at uhub? port ?
-wsmouse* at uep? mux 0
-
-# USB Keyboards
-ukbd*	at uhidev? reportid ?
-wskbd*	at ukbd? console ? mux 1
-
-# USB serial adpater
-ucycom*	at uhidev? reportid ?
-
-# USB Generic HID devices
-uhid*	at uhidev? reportid ?
-
-# USB Printer
-ulpt*	at uhub? port ? configuration ? interface ?
-
-# USB Modem
-umodem*	at uhub? port ? configuration ?
-ucom*	at umodem?
-
-# USB Mass Storage
-umass*	at uhub? port ? configuration ? interface ?
-scsibus* at umass?
-wd*	at umass?
-
-# USB audio
-uaudio*	at uhub? port ? configuration ?
-
-# USB MIDI
-umidi* at uhub? port ? configuration ?
-
-# USB IrDA
-# USB-IrDA bridge spec
-uirda* at uhub? port ? configuration ? interface ?
-irframe* at uirda?
-
-# SigmaTel STIr4200 USB/IrDA Bridge
-ustir* at uhub? port ?
-irframe* at ustir?
-
-# USB Ethernet adapters
-aue*	at uhub? port ?		# ADMtek AN986 Pegasus based adapters
-axe*	at uhub? port ?		# ASIX AX88172 based adapters
-cdce*	at uhub? port ?		# CDC, Ethernet Networking Control Model
-cue*	at uhub? port ?		# CATC USB-EL1201A based adapters
-kue*	at uhub? port ?		# Kawasaki LSI KL5KUSB101B based adapters
-udav*	at uhub? port ?		# Davicom DM9601 based adapters
-url*	at uhub? port ?		# Realtek RTL8150L based adapters
-
-# USB 802.11 adapters
-atu*	at uhub? port ?		# Atmel AT76C50XX based adapters
-ral*	at uhub? port ?		# Ralink Technology RT25x0 802.11a/b/g
-
-# Prolific PL2301/PL2302 host-to-host adapter
-upl*	at uhub? port ?
-
-# Serial adapters
-ubsa*	at uhub? port ?		# Belkin serial adapter
-ucom*	at ubsa? portno ?
-
-uftdi*	at uhub? port ?		# FTDI FT8U100AX serial adapter
-ucom*	at uftdi? portno ?
-
-umct*	at uhub? port ?		# MCT USB-RS232 serial adapter
-ucom*	at umct? portno ?
-
-uplcom* at uhub? port ? 	# I/O DATA USB-RSAQ2 serial adapter
-ucom*	at uplcom? portno ?
-
-uvscom* at uhub? port ? 	# SUNTAC Slipper U VS-10U serial adapter
-ucom*	at uvscom? portno ?
-
-# Diamond Multimedia Rio 500
-urio*	at uhub? port ?
-
-# USB Handspring Visor
-uvisor*	at uhub? port ?
-ucom*	at uvisor?
-
-# Kyocera AIR-EDGE PHONE
-ukyopon* at uhub? port ?
-ucom*	at ukyopon? portno ?
-
-# USB scanners
-uscanner* at uhub? port ?
-
-# USB scanners that use SCSI emulation, e.g., HP5300
-usscanner* at uhub? port ?
-
-# Y@P firmware loader
-uyap* at uhub? port ?
-
-# D-Link DSB-R100 USB radio
-udsbr*	at uhub? port ?
-radio*	at udsbr?
-
-# USB Generic driver
-ugen*	at uhub? port ?
-
-## Loopback network interface; required
-pseudo-device	loop
-
-## SLIP and CSLIP interfaces, for IP over a serial line.
-pseudo-device	sl		
-
-## PPP, the successor to SLIP.  See pppd(8).
-pseudo-device	ppp		
-
-## PPP over Ethernet (RFC 2516)
-pseudo-device	pppoe
-
-## Starmode Radio IP, a special hardware network device.
-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	tap			# virtual Ethernet
-
-## Generic L3 over IP tunnel
-#pseudo-device	gre			# generic L3 over IP tunnel
-
-## Berkeley Packet Filter, required to run RARPD.  A generic C-language
-## interface that allows selective examining of incoming packets.
-pseudo-device	bpfilter
-
-## IEEE 802.1q encapsulation
-pseudo-device	vlan
-
-## Simple inter-network traffic bridging
-pseudo-device	bridge
-#options 	BRIDGE_IPF		# bridge uses IP/IPv6 pfil hooks too
-
-## IP Filter, used in firewall and NAT applications.  See ipnat(8) for
-## one example of the use of the IP Filter.
-pseudo-device	ipfilter
-
-## for IPv6
-pseudo-device	gif			# IPv[46] over IPv[46] tunnel (RFC1933)
-#pseudo-device	faith			# IPv[46] tcp relay translation i/f
-pseudo-device	stf			# 6to4 IPv6 over IPv4 encapsulation
-
-
-#### CardBus and PCMCIA devices
-
-# PCI CardBus bridge support
-#cbb*	at pci? dev ? function ?
-#cardslot* at cbb?
-
-# CardBus bus support
-#cardbus* at cardslot?
-#pcmcia* at cardslot?
-
-## SBus to PCMCIA bridge
-#nell*	at sbus? slot ? offset ?		# PCMCIA bridge
-#pcmcia*	at nell?
-
-## CardBus cards; UT marks untested.
-
-# CardBus serial interfaces
-#com*	at cardbus? function ?	# Modems and serial cards UT
-
-# CardBus SCSI controllers
-#adv*	at cardbus? function ?	# AdvanSys 1200[A,B], 9xx[U,UA] SCSI UT
-#ahc*	at cardbus? function ?	# Adaptec ADP-1480 UT
-#njs*	at cardbus? function ?	# Workbit NinjaSCSI-32
-
-# CardBus network interfaces
-#ath*	at cardbus? function ?	# Atheros 5210/5211/5212 802.11
-#atw*	at cardbus? function ?	# ADMtek ADM8211 (802.11) UT
-#ex*	at cardbus? function ?	# 3Com 3C575TX
-#fxp*	at cardbus? function ?	# Intel i8255x UT
-#ral*	at cardbus? function ?	# Ralink Technology RT25x0 802.11a/b/g UT
-#rtk*	at cardbus? function ?	# Realtek 8129/8139 UT
-#tlp*	at cardbus? function ?	# DECchip 21143
-
-# CardBus USB controllers
-#ehci*	at cardbus? function ?	# Enhanced Host Controller
-#ohci*	at cardbus? function ?	# Open Host Controller
-
-## PCMCIA cards; UT marks untested.
-
-# PCMCIA serial interfaces
-#com*	at pcmcia? function ?		# Modems and serial cards
-
-#pcmcom* at pcmcia? function ?		# PCMCIA multi-port serial cards UT
-#com*	at pcmcom? slave ?		# ...and the slave devices
-
-# PCMCIA SCSI controllers
-#aic*	at pcmcia? function ?		# Adaptec APA-1460 SCSI UT
-#esp*	at pcmcia? function ?		# Qlogic ESP406/FAS408 SCSI UT
-
-# PCMCIA IDE controllers
-#wdc*	at pcmcia? function ?
-
-# PCMCIA network interfaces
-#an*	at pcmcia? function ?		# Aironet PC4500/PC4800 (802.11) UT
-#awi*	at pcmcia? function ?		# BayStack 650/660 (802.11FH/DS) UT
-#cnw*	at pcmcia? function ?		# Xircom/Netwave AirSurfer UT
-#cs*	at pcmcia? function ?		# CS89xx Ethernet UT
-#ep*	at pcmcia? function ?		# 3Com 3c589 and 3c562 Ethernet
-#mbe*	at pcmcia? function ?		# MB8696x based Ethernet UT
-#ne*	at pcmcia? function ?		# NE2000-compatible Ethernet
-#ray*	at pcmcia? function ?		# Raytheon Raylink (802.11) UT
-#sm*	at pcmcia? function ?		# Megahertz Ethernet UT
-# tr at pcmcia has problems with Cardbus bridges
-#tr*	at pcmcia? function ?		# TROPIC based Token-Ring UT
-#wi*	at pcmcia? function ?		# Lucent/Intersil WaveLan IEEE (802.11)
-#xirc*	at pcmcia? function ?		# Xircom CreditCard Ethernet UT
-#com*	at xirc?
-#xi*	at xirc?
-#mhzc*	at pcmcia? function ?		# Megahertz Ethernet/Modem combo cards
-#com*	at mhzc?
-#sm*	at mhzc?
-
-# PCMCIA audio devices
-#esl*	at pcmcia? function ?			# ESS 1688 AudioDrive UT
-
-#### Audio and video devices
-
-## /dev/audio support (`audiocs' plus `audio')
-##
-audiocs*	at sbus? slot ? offset ?	# SUNW,CS4231
-audiocs*	at ebus?			# SUNW,CS4231 in U5/U10
-autri*		at pci? dev ? function ?	# Blade 100 'sound'
-
-audio*		at audiobus?
-
-#midi*		at midibus?
-
-
-## Sun "bwtwo" black and white framebuffer, found on sun4, sun4c, and sun4m
-## systems.  If your sun4 system has a cgfour installed in the P4 slot,
-## the P4 entries for "bwtwo" will attach to the overlay plane of the
-## "cgfour".
-
-#bwtwo0		at sbus? slot ? offset ?	# sun4c and sun4m
-#bwtwo*		at sbus? slot ? offset ?
-
-## Sun "cgthree" Sbus color framebuffer
-#cgthree0	at sbus? slot ? offset ?
-#cgthree*	at sbus? slot ? offset ?
-
-## Sun "cgsix" accelerated color framebuffer.
-cgsix*		at sbus? slot ? offset ?
-
-## Sun FFB
-ffb*		at mainbus0
-
-# On board vga on U5/U10 etc.
-machfb*		at pci?
-
-# make sure the console display is always wsdisplay0
-wsdisplay0	at wsemuldisplaydev? console 1
-wsdisplay*	at wsemuldisplaydev?
-
-# wsmouse for sun ms
-wsmouse*        at ms0
-
-# wskbd for sun kbd
-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 	WS_DEFAULT_FG=WSCOL_BLACK
-options 	WS_DEFAULT_BG=WSCOL_LIGHT_WHITE
-options 	WSDISPLAY_COMPAT_USL		# VT handling
-options 	WSDISPLAY_COMPAT_RAWKBD		# can get raw scancodes
-options 	WSDISPLAY_DEFAULTSCREENS=4
-options 	FONT_GALLANT12x22		# PROM font look-alike
-
-#### Other device configuration
-
-### Other pseudo-devices
-
-pseudo-device 	crypto			# /dev/crypto device
-pseudo-device	swcrypto		# software crypto implementation
-
-## Pseudo ttys, required for network logins and programs like screen.
-
-pseudo-device	pty			# pseudo-ttys (for network, etc.)
-
-## Random device, used to implement /dev/random (a source of random noise),
-## and generate randomness for some kernel formulae.
-
-pseudo-device	rnd
-
-pseudo-device	wsmux			# mouse & keyboard multiplexor
-pseudo-device	wsfont
-pseudo-device	clockctl		# user control of clock subsystem
-pseudo-device	ksyms			# /dev/ksyms
-#pseudo-device	pf			# PF packet filter
-#pseudo-device	pflog			# PF log if
-pseudo-device	fss		4	# file system snapshot device
-
-# Veriexec
-#options VERIFIED_EXEC
-#
-# a pseudo device needed for veriexec
-#pseudo-device	veriexec		1
+# $NetBSD$
 #
-# Uncomment the fingerprint methods below that are desired. Note that
-# removing fingerprint methods will have almost no impact on the kernel
-# code size.
+# GENERIC machine description file for 32-bit kernel
 #
-#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
+include 	"arch/sparc64/conf/GENERIC"
+
+#ident 	"GENERIC32-$Revision$"
+
+include 	"arch/sparc64/conf/std.sparc64-32"
 
+no options 	COMPAT_NETBSD32
+no options 	COMPAT_SVR4_32
Index: INSTALL
===================================================================
RCS file: /cvsroot/src/sys/arch/sparc64/conf/INSTALL,v
retrieving revision 1.19
diff -u -r1.19 INSTALL
--- INSTALL	7 Dec 2005 12:40:47 -0000	1.19
+++ INSTALL	28 Jun 2006 18:01:27 -0000
@@ -4,24 +4,12 @@
 #	kernel, that are not already included in GENERIC32!
 #	See the include below...
 
-include "arch/sparc64/conf/GENERIC32"
+include "arch/sparc64/conf/GENERIC"
 
 #ident 		"INSTALL-$Revision: 1.19 $"
 
-include "arch/sparc64/conf/std.sparc64-64"
-
-options 	COMPAT_NETBSD32	# NetBSD/sparc binary compatibility
-options 	COMPAT_SVR4_32	# SunOS 5.x 32-bit binary compatibility
-
 makeoptions	COPTS="-Os"
 
-# DEBUG options
-
-#options 	LOCKDEBUG
-#options 	DIAGNOSTIC
-#makeoptions	DEBUG="-g"
-#options 	DEBUG
-#options 	SYSCALL_DEBUG
 options 	PIPE_SOCKETPAIR		# smaller, but slower pipe(2)
 options 	MALLOC_NOINLINE		# Not inlining MALLOC saves memory
 
Index: NONPLUS
===================================================================
RCS file: /cvsroot/src/sys/arch/sparc64/conf/NONPLUS,v
retrieving revision 1.57
diff -u -r1.57 NONPLUS
--- NONPLUS	5 Feb 2006 05:02:02 -0000	1.57
+++ NONPLUS	28 Jun 2006 18:01:27 -0000
@@ -121,7 +121,8 @@
 options 	COMPAT_30	# NetBSD 3.0 compatibility.
 options 	COMPAT_SUNOS	# SunOS 4.x binary compatibility
 options 	COMPAT_SVR4	# SunOS 5.x binary compatibility
-#options 	COMPAT_NETBSD32	# NetBSD/sparc binary compatibility
+options 	COMPAT_SVR4_32	# 32-bit SVR4 binaries
+options 	COMPAT_NETBSD32	# NetBSD/sparc binary compatibility
 options 	EXEC_ELF32	# Exec module for NetBSD/sparc 1.5 binaries.
 #options 	SYSCALL_DEBUG
 options 	EXEC_AOUT	# Exec module for NetBSD/sparc pre-1.5 binaries.
Index: std.sparc64
===================================================================
RCS file: /cvsroot/src/sys/arch/sparc64/conf/std.sparc64,v
retrieving revision 1.14
diff -u -r1.14 std.sparc64
--- std.sparc64	5 Apr 2006 06:54:26 -0000	1.14
+++ std.sparc64	28 Jun 2006 18:01:27 -0000
@@ -9,4 +9,7 @@
 machine		sparc64		# Machine architecture; required by config(8)
 include		"conf/std"	# MI standard options
 
+makeoptions	LP64="yes"
+
 options 	EXEC_SCRIPT	# execve(2) support for scripts
+options 	EXEC_ELF64	# 64-bit NetBSD and SunOS 5 bins
Index: std.sparc64-64
===================================================================
RCS file: /cvsroot/src/sys/arch/sparc64/conf/std.sparc64-64,v
retrieving revision 1.1
diff -u -r1.1 std.sparc64-64
--- std.sparc64-64	24 Oct 2001 18:49:40 -0000	1.1
+++ std.sparc64-64	28 Jun 2006 18:01:27 -0000
@@ -1,11 +0,0 @@
-#	$NetBSD: std.sparc64-64,v 1.1 2001/10/24 18:49:40 thorpej Exp $
-
-#
-# Mandatory NetBSD/sparc64 kernel options when building 64-bit kernels.
-# Note, you still must include "std.sparc64" in your kernel config file.
-# Note this file MUST be included *after* "std.sparc64".
-#
-
-makeoptions	LP64="yes"	# enable 64-bit logic in kernel Makefile
-
-options 	EXEC_ELF64	# 64-bit NetBSD and SunOS 5 bins
--- /dev/null	2006-06-29 02:57:52.000000000 +0900
+++ std.sparc64-32	2006-06-29 02:39:25.000000000 +0900
@@ -0,0 +1,12 @@
+#	$NetBSD$
+
+#
+# Unneeded NetBSD/sparc64 kernel options when building 32-bit kernels.
+# Note, you still must include "std.sparc64" in your kernel config file.
+# Note this file MUST be included *after* "std.sparc64".
+#
+
+no makeoptions	LP64
+makeoptions	LP64="no"
+
+no options 	EXEC_ELF64
--- /dev/null	2006-06-29 02:57:52.000000000 +0900
+++ NONPLUS32	2006-06-29 02:50:35.000000000 +0900
@@ -0,0 +1,9 @@
+# 	$NetBSD$
+
+include "arch/sparc64/conf/NONPLUS"
+include "arch/sparc64/conf/std.sparc64-32"
+
+#ident 		"NONPLUS32-$Revision$"
+
+no options 	COMPAT_NETBSD32	# NetBSD/sparc binary compatibility
+no options 	COMPAT_SVR4_32	# 32-bit SVR4 binaries