Index: head/sys/powerpc/conf/QORIQ64
===================================================================
--- head/sys/powerpc/conf/QORIQ64	(revision 325261)
+++ head/sys/powerpc/conf/QORIQ64	(revision 325262)
@@ -1,105 +1,116 @@
 #
 # Custom kernel for Freescale QorIQ (P5xxx, Txxxx) based boards, like
 # AmigaOne X5000
 #
 # $FreeBSD$
 #
 
 cpu		BOOKE
 cpu		BOOKE_E500
 ident		MPC85XX
 
 machine		powerpc	powerpc64
 
 include 	"dpaa/config.dpaa"
 makeoptions	DEBUG="-Wa,-me500 -g"
 makeoptions	WERROR="-Werror -Wno-format -Wno-redundant-decls"
 makeoptions	NO_MODULES=yes
 
-#options 	EARLY_PRINTF
-
 options 	FPU_EMU
 
-options 	BOOTVERBOSE=1
 options 	_KPOSIX_PRIORITY_SCHEDULING
 options 	ALT_BREAK_TO_DEBUGGER
 options 	BREAK_TO_DEBUGGER
 options 	BOOTP
 options 	BOOTP_NFSROOT
 #options 	BOOTP_NFSV3
 options 	CD9660
 #options 	COMPAT_43
 options 	COMPAT_FREEBSD32	#Compatible with FreeBSD/powerpc binaries
 options 	DDB
 #options 	DEADLKRES
 options 	DEVICE_POLLING
 #options 	DIAGNOSTIC
 options 	FDT
 #makeoptions	FDT_DTS_FILE=mpc8555cds.dts
-options 	FFS
+options 	FFS			#Berkeley Fast Filesystem
+options 	SOFTUPDATES		#Enable FFS soft updates support
+options 	UFS_ACL			#Support for access control lists
+options 	UFS_DIRHASH		#Improve performance on big directories
+options 	UFS_GJOURNAL		#Enable gjournal-based UFS journaling
+options 	QUOTA			#Enable disk quotas for UFS
 options 	GDB
 options 	GEOM_PART_GPT
+options 	GEOM_LABEL		#Provides labelization
 options 	INET
 options 	INET6
 options 	TCP_HHOOK		# hhook(9) framework for TCP
 options 	INVARIANTS
 options 	INVARIANT_SUPPORT
 options 	KDB
+options 	KDB_TRACE		# Print a stack trace for a panic.
 options 	KTRACE
 options 	MD_ROOT
 options 	MPC85XX
 options 	MSDOSFS
 options 	NFS_ROOT
 options 	NFSCL
 options 	NFSLOCKD
-options		PRINTF_BUFR_SIZE=128	# Prevent printf output being interspersed.
+options 	PRINTF_BUFR_SIZE=128	# Prevent printf output being interspersed.
 options 	PROCFS
 options 	PSEUDOFS
 options 	SCHED_ULE
 options 	CAPABILITIES
 options 	CAPABILITY_MODE
 options 	SMP
+options 	STACK			#stack(9) support
 options 	SYSVMSG
 options 	SYSVSEM
 options 	SYSVSHM
 options 	WITNESS
 options 	WITNESS_SKIPSPIN
+options 	HWPMC_HOOKS
+options 	KDTRACE_HOOKS		# Kernel DTrace hooks
+options 	DDB_CTF			# Kernel ELF linker loads CTF data
 
 device		ata
 device		bpf
 device		cfi
 device		crypto
 device		cryptodev
 device		da
+device  	ds1307
 device		ds1553
 device		em
 device		alc
 device  	dpaa
 device		ether
 device		fxp
 device  	gpio
 device  	gpiopower
 device		iic
 device		iicbus
 #device		isa
 device		loop
 device		md
 device		miibus
 device  	mmc
 device  	mmcsd
 device		pass
 device		pci
 device		random
 #device		rl
 device		scbus
 device		scc
 device  	sdhci
 device		sec
+device  	spibus
+device  	spigen
 device		tun
 device		uart
 options 	USB_DEBUG	# enable debug msgs
 #device		uhci
 device		ehci
 device		umass
 device		usb
 device		vlan