Sync with other arches; add bloat.

1 files changed, 35 insertions, 25 deletions

diff --git a/sys/sparc64/conf/GENERIC b/sys/sparc64/conf/GENERIC
index e6266e1..d7081af 100644
--- a/sys/sparc64/conf/GENERIC
+++ b/sys/sparc64/conf/GENERIC
@@ -35,25 +35,25 @@ makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
 #	At this time all platforms are supported, as-is.
 
 options 	INET			#InterNETworking
-#options 	INET6			#IPv6 communications protocols
+options 	INET6			#IPv6 communications protocols
 options 	FFS			#Berkeley Fast Filesystem
-#options 	SOFTUPDATES		#Enable FFS soft updates support
-#options 	UFS_DIRHASH		#Improve performance on big directories
+options 	SOFTUPDATES		#Enable FFS soft updates support
+options 	UFS_DIRHASH		#Improve performance on big directories
 options 	MD_ROOT			#MD is a potential root device
 options 	NFSCLIENT		#Network Filesystem Client
 options 	NFSSERVER		#Network Filesystem Server
-options 	NFS_ROOT		#NFS usable as root device
+#options 	NFS_ROOT		#NFS usable as root device
 #options 	MSDOSFS			#MSDOS Filesystem
 options 	CD9660			#ISO 9660 Filesystem
 options 	PROCFS			#Process filesystem (requires PSEUDOFS)
 options 	PSEUDOFS		#Pseudo-filesystem framework
-#options 	COMPAT_43		#Compatible with BSD 4.3 [KEEP THIS!]
+options 	COMPAT_43		#Compatible with BSD 4.3 [KEEP THIS!]
 #options 	SCSI_DELAY=15000	#Delay (in ms) before probing SCSI 
 #options 	UCONSOLE		#Allow users to grab the console
-#options 	KTRACE			#ktrace(1) syscall trace support
-#options 	SYSVSHM			#SYSV-style shared memory
-#options 	SYSVMSG			#SYSV-style message queues
-#options 	SYSVSEM			#SYSV-style semaphores
+options 	KTRACE			#ktrace(1) syscall trace support
+options 	SYSVSHM			#SYSV-style shared memory
+options 	SYSVMSG			#SYSV-style message queues
+options 	SYSVSEM			#SYSV-style semaphores
 #options 	P1003_1B		#Posix P1003_1B real-time extentions
 #options 	_KPOSIX_PRIORITY_SCHEDULING
 
@@ -65,7 +65,7 @@ options 	INVARIANT_SUPPORT	#Extra sanity checks of internal structures, required
 #options 	WITNESS			#Enable mutex checks to detects deadlocks and cycles
 
 # To make an SMP kernel, the next line is needed
-#options 	SMP			# Symmetric MultiProcessor Kernel
+options 	SMP			# Symmetric MultiProcessor Kernel
 
 # Standard busses
 device		apb		# Sun APB PCI-PCI bridge
@@ -87,8 +87,8 @@ device		atapicd		# ATAPI CDROM drives
 # SCSI Controllers
 device		ahc		# AHA2940 and onboard AIC7xxx devices
 #device		esp		# 53C94 & friends, not CAM-ified
-device		isp		# Qlogic family
-device		ispfw		# Firmware module for Qlogic host adapters
+#device		isp		# Qlogic family
+#device		ispfw		# Firmware module for Qlogic host adapters
 #device		ncr		# NCR/Symbios Logic
 device		sym		# NCR/Symbios Logic (newer chipsets + those of `ncr')
 
@@ -97,7 +97,7 @@ device		scbus		# SCSI bus (required)
 #device		ch		# SCSI media changers
 device		da		# Direct Access (disks)
 #device		sa		# Sequential Access (tape etc)
-#device		cd		# CD
+device		cd		# CD
 #device		pass		# Passthrough device (direct SCSI access)
 #device		ses		# SCSI Environmental Services (and SAF-TE)
 
@@ -121,16 +121,13 @@ device		da		# Direct Access (disks)
 # the most basic console driver is the OpenBoot firmware
 device		ofw_console
 
-# real time clock
-#device		mcclock
-
 # Builtin hardware
 device		genclock	# generic clock interface
 device		eeprom		# eeprom (really an ebus driver for the mk48txx)
 device		"mk48txx"	# Mostek MK48T02, MK48T08, MK48T59 clock
 
 # Serial (COM) ports
-device		sio		# 8250, 16[45]50 based serial ports
+#device		sio		# 8250, 16[45]50 based serial ports
 
 ## Parallel port
 #device		ppc
@@ -166,17 +163,17 @@ device		hme		# Sun HME (Happy Meal Ethernet)
 device		random		# Entropy device
 device		loop		# Network loopback
 device		ether		# Ethernet support
-#device		sl		# Kernel SLIP
-#device		ppp	1	# Kernel PPP
-#device		tun		# Packet tunnel.
+device		sl		# Kernel SLIP
+device		ppp	1	# Kernel PPP
+device		tun		# Packet tunnel.
 device		pty		# Pseudo-ttys (telnet etc)
 device		md		# Memory "disks"
-#device		gif		# IPv6 and IPv4 tunneling
-#device		faith		# IPv6-to-IPv4 relaying/(translation)
+device		gif		# IPv6 and IPv4 tunneling
+device		faith		# IPv6-to-IPv4 relaying/(translation)
 
 # The `bpf' device enables the Berkeley Packet Filter.
 # Be aware of the administrative consequences of enabling this!
-#device		bpf		#Berkeley packet filter
+device		bpf		#Berkeley packet filter
 
 # USB support
 #device		uhci		# UHCI PCI->USB interface
@@ -195,9 +192,22 @@ device		md		# Memory "disks"
 
 
 # Tempary things until things are farther along.
-makeoptions NO_WERROR=true
+makeoptions	NO_WERROR=true
 makeoptions	NO_MODULES=does_not_compile_yet
-options 	MD_ROOT_SIZE=64
+#options 	MD_ROOT_SIZE=64
 options 	SUN_DISKLABEL		# Use SUN_DISKLABEL or NETBSD_DISKLABEL
 options 	PCI_ENABLE_IO_MODES	# Enable all PCI resources
 options 	ATA_ENABLE_BUSMASTER	# Force busmaster support if available
+
+options		KTR
+options		KTR_COMPILE=0xffffffff
+options		KTR_ENTRIES=8192
+options		KTR_MASK=0
+
+options		OFW_PCI_DEBUG
+
+#options		BOOTP
+#options		BOOTP_NFSROOT
+#options		BOOTP_NFSV3
+#options		BOOTP_COMPAT
+#options		BOOTP_WIRED_TO=hme0