tart to clean up the armv6 kernel configs by reducing the diff between

them in the first sections and the later FDT support.

Differential Revision:	https://reviews.freebsd.org/D1346
Reviewed by:	rpaulo (earlier version)

1 files changed, 28 insertions, 22 deletions

diff --git a/sys/arm/conf/PANDABOARD b/sys/arm/conf/PANDABOARD
index cc345cb..7a71d12 100644
--- a/sys/arm/conf/PANDABOARD
+++ b/sys/arm/conf/PANDABOARD
@@ -1,8 +1,9 @@
+#
 # PANDABOARD -- Custom configuration for the PandaBoard ARM development
 # platform, check out www.pandaboard.org
 #
-# For more information on this file, please read the handbook section on
-# Kernel Configuration Files:
+# For more information on this file, please read the config(5) manual page,
+# and/or the handbook section on Kernel Configuration Files:
 #
 #    http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html
 #
@@ -28,44 +29,53 @@ hints		"PANDABOARD.hints"
 
 include 	"../ti/omap4/pandaboard/std.pandaboard"
 
-#To statically compile in device wiring instead of /boot/device.hints
 makeoptions	MODULES_OVERRIDE=""
-makeoptions WITHOUT_MODULES="ahc"
+makeoptions	WITHOUT_MODULES="ahc"
 
 options 	HZ=100
 options 	SCHED_4BSD		# 4BSD scheduler
+options 	PREEMPTION		# Enable kernel thread preemption
 options 	INET			# InterNETworking
 options 	INET6			# IPv6 communications protocols
+options 	SCTP			# Stream Control Transmission Protocol
 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 	GEOM_PART_BSD		# BSD partition scheme
-options 	GEOM_PART_MBR		# MBR partition scheme
-options 	TMPFS			# Efficient memory filesystem
+options 	UFS_GJOURNAL		# Enable gjournal-based UFS journaling
+options 	QUOTA			# Enable disk quotas for UFS
+options 	NFSCL			# New Network Filesystem Client
+options 	NFSLOCKD		# Network Lock Manager
+options 	NFS_ROOT		# NFS usable as /, requires NFSCL
 options 	MSDOSFS			# MSDOS Filesystem
 options 	CD9660			# ISO 9660 Filesystem
 options 	PROCFS			# Process filesystem (requires PSEUDOFS)
 options 	PSEUDOFS		# Pseudo-filesystem framework
+options 	TMPFS			# Efficient memory filesystem
+options 	GEOM_PART_GPT		# GUID Partition Tables
+options 	GEOM_PART_BSD		# BSD partition scheme
+options 	GEOM_PART_MBR		# MBR partition scheme
 options 	COMPAT_43		# Compatible with BSD 4.3 [KEEP THIS!]
 options 	SCSI_DELAY=5000		# Delay (in ms) before probing SCSI
 options 	KTRACE			# ktrace(1) support
 options 	SYSVSHM			# SYSV-style shared memory
 options 	SYSVMSG			# SYSV-style message queues
 options 	SYSVSEM			# SYSV-style semaphores
-options 	_KPOSIX_PRIORITY_SCHEDULING # Posix P1003_1B real-time extensions
+options 	_KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions
 options 	KBD_INSTALL_CDEV	# install a CDEV entry in /dev
-options 	PREEMPTION
 options 	PLATFORM
-options 	FREEBSD_BOOT_LOADER
-options 	VFP			# vfp/neon
-options  	SMP			# Enable multiple cores
+options 	FREEBSD_BOOT_LOADER	# Process metadata passed from loader(8)
+options 	VFP			# Enable floating point hardware support
+options 	SMP			# Enable multiple cores
 
 # Debugging for use in -current
 makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
 options 	BREAK_TO_DEBUGGER
 #options 	VERBOSE_SYSINIT		# Enable verbose sysinit messages
-options 	KDB
+options 	KDB			# Enable kernel debugger support
+# For minimum debugger support (stable branch) use:
+#options 	KDB_TRACE		# Print a stack trace for a panic
+# For full debugger support use this instead:
 options 	DDB			# Enable the kernel debugger
 #options 	INVARIANTS		# Enable calls of extra sanity checking
 #options 	INVARIANT_SUPPORT	# Extra sanity checks of internal structures, required by INVARIANTS
@@ -73,14 +83,10 @@ options 	DDB			# Enable the kernel debugger
 #options 	WITNESS_SKIPSPIN	# Don't run witness on spinlocks for speed
 #options 	DIAGNOSTIC
 
-# NFS support
-options 	NFSCL
-
-# NFS root
-options 	NFS_ROOT		# NFS usable as /, requires NFSCLIENT
+# NFS root from boopt/dhcp
+#options 	BOOTP
 #options 	BOOTP_NFSROOT
 #options 	BOOTP_COMPAT
-#options 	BOOTP
 #options 	BOOTP_NFSV3
 #options 	BOOTP_WIRED_TO=ue0
 
@@ -146,6 +152,6 @@ device		twl_vreg
 device		twl_clks
 
 # Flattened Device Tree
-options         FDT
-options         FDT_DTB_STATIC
-makeoptions     FDT_DTS_FILE=pandaboard.dts
+options 	FDT			# Configure using FDT/DTB data
+options 	FDT_DTB_STATIC
+makeoptions	FDT_DTS_FILE=pandaboard.dts