diff --git a/sys/sparc64/conf/GENERIC b/sys/sparc64/conf/GENERIC
index 83ede3c977e3..e6266e1329f3 100644
--- a/sys/sparc64/conf/GENERIC
+++ b/sys/sparc64/conf/GENERIC
@@ -34,19 +34,19 @@ makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
 # Platforms supported
 #	At this time all platforms are supported, as-is.
 
-#options 	INET			#InterNETworking
+options 	INET			#InterNETworking
 #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 	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 	NFSCLIENT		#Network Filesystem Client
+options 	NFSSERVER		#Network Filesystem Server
+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 	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 	SCSI_DELAY=15000	#Delay (in ms) before probing SCSI 
 #options 	UCONSOLE		#Allow users to grab the console
@@ -59,6 +59,7 @@ options 	MD_ROOT			#MD is a potential root device
 
 # Debugging for use in -current
 options 	DDB			#Enable the kernel debugger
+options 	BREAK_TO_DEBUGGER	#a BREAK on a comconsole drops to DDB
 options 	INVARIANTS		#Enable calls of extra sanity checking
 options 	INVARIANT_SUPPORT	#Extra sanity checks of internal structures, required by INVARIANTS
 #options 	WITNESS			#Enable mutex checks to detects deadlocks and cycles
@@ -67,30 +68,34 @@ options 	INVARIANT_SUPPORT	#Extra sanity checks of internal structures, required
 #options 	SMP			# Symmetric MultiProcessor Kernel
 
 # Standard busses
-#device		isa
-#device		pci
+device		apb		# Sun APB PCI-PCI bridge
+device		ebus
+device		isa
+device		pci
+device		sbus
 
 # Floppy drives
 #device		fdc
 
 # ATA and ATAPI devices
-#device		ata
-#device		atadisk		# ATA disk drives
-#device		atapicd		# ATAPI CDROM drives
+device		ata
+device		atadisk		# ATA disk drives
+device		atapicd		# ATAPI CDROM drives
 #device		atapifd		# ATAPI floppy drives
 #device		atapist		# ATAPI tape drives
 
 # SCSI Controllers
-#device		ahc		# AHA2940 and onboard AIC7xxx devices
+device		ahc		# AHA2940 and onboard AIC7xxx devices
 #device		esp		# 53C94 & friends, not CAM-ified
-#device		isp		# Qlogic family
+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')
+device		sym		# NCR/Symbios Logic (newer chipsets + those of `ncr')
 
 # SCSI peripherals
-#device		scbus		# SCSI bus (required)
+device		scbus		# SCSI bus (required)
 #device		ch		# SCSI media changers
-#device		da		# Direct Access (disks)
+device		da		# Direct Access (disks)
 #device		sa		# Sequential Access (tape etc)
 #device		cd		# CD
 #device		pass		# Passthrough device (direct SCSI access)
@@ -119,8 +124,13 @@ 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
@@ -137,9 +147,11 @@ device		ofw_console
 #device		vx		# 3Com 3c590, 3c595 (``Vortex'')
 
 # PCI Ethernet NICs that use the common MII bus controller code.
-#device		miibus		# MII bus support
+device		miibus		# MII bus support
 #device		dc		# DEC/Intel 21143 and workalikes
 #device		fxp		# Intel EtherExpress PRO/100B (82557, 82558)
+device		gem		# Sun GEM/Sun ERI/Apple HMAC
+device		hme		# Sun HME (Happy Meal Ethernet)
 #device		pcn		# AMD Am79C97x PCI 10/100 NICs
 #device		rl		# RealTek 8129/8139
 #device		sf		# Adaptec AIC-6915 (``Starfire'')
@@ -151,13 +163,13 @@ device		ofw_console
 #device		xl		# 3Com 3c90x (``Boomerang'', ``Cyclone'')
 
 # Pseudo devices - the number indicates how many units to allocated.
-#device		random		# Entropy device
-#device		loop		# Network loopback
-#device		ether		# Ethernet support
+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		pty		# Pseudo-ttys (telnet etc)
+device		pty		# Pseudo-ttys (telnet etc)
 device		md		# Memory "disks"
 #device		gif		# IPv6 and IPv4 tunneling
 #device		faith		# IPv6-to-IPv4 relaying/(translation)
@@ -183,5 +195,9 @@ device		md		# Memory "disks"
 
 
 # Tempary things until things are farther along.
+makeoptions NO_WERROR=true
 makeoptions	NO_MODULES=does_not_compile_yet
 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