First pass clenup over the Marvell db-88f6xxx kernel configs.

4 files changed, 120 insertions, 124 deletions

diff --git a/sys/arm/conf/DB-88F6XXX b/sys/arm/conf/DB-88F6XXX
index 4018bcd..ec3eff0 100644
--- a/sys/arm/conf/DB-88F6XXX
+++ b/sys/arm/conf/DB-88F6XXX
@@ -10,47 +10,48 @@ include 	"../mv/kirkwood/std.db88f6xxx"
 
 options 	SOC_MV_KIRKWOOD
 
-#makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
 makeoptions	WERROR="-Werror"
 
 options 	SCHED_4BSD		# 4BSD scheduler
 options 	INET			# InterNETworking
 options 	INET6			# IPv6 communications protocols
-options 	GEOM_PART_BSD		# BSD partition scheme
-options 	GEOM_PART_MBR		# MBR partition scheme
-options 	TMPFS			# Efficient memory filesystem
 options 	FFS			# Berkeley Fast Filesystem
 options 	NANDFS			# NAND Filesystem
 options 	NFSCL			# Network Filesystem Client
 options 	NFSLOCKD		# Network Lock Manager
 options 	NFS_ROOT		# NFS usable as /, requires NFSCL
-options 	BOOTP
-options 	BOOTP_NFSROOT
-options 	BOOTP_NFSV3
-options 	BOOTP_WIRED_TO=mge0
-
-#options 	ROOTDEVNAME=\"ufs:/dev/da0a\"
-
+options 	TMPFS			# Efficient memory filesystem
+options 	GEOM_PART_BSD		# BSD partition scheme
+options 	GEOM_PART_MBR		# MBR partition scheme
 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 	MUTEX_NOINLINE
 options 	RWLOCK_NOINLINE
 options 	NO_FFS_SNAPSHOT
 options 	NO_SWAPPING
 
-# Debugging
+# Debugging for use in -current
+#makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
 options 	ALT_BREAK_TO_DEBUGGER
-options 	DDB
+options 	KDB			# Enable kernel debugger support
+options 	DDB			# Enable the kernel debugger
 #options 	DEADLKRES		# Enable the deadlock resolver
-#options 	DIAGNOSTIC
 #options 	INVARIANTS		# Enable calls of extra sanity checking
 #options 	INVARIANT_SUPPORT	# Extra sanity checks of internal structures, required by INVARIANTS
-options 	KDB
 options 	WITNESS			# Enable checks to detect deadlocks and cycles
 options 	WITNESS_SKIPSPIN	# Don't run witness on spinlocks for speed
 #options 	WITNESS_KDB
+#options 	DIAGNOSTIC
+
+# NFS root from boopt/dhcp
+options 	BOOTP
+options 	BOOTP_NFSROOT
+options 	BOOTP_NFSV3
+options 	BOOTP_WIRED_TO=mge0
+
+#options 	ROOTDEVNAME=\"ufs:/dev/da0a\"
 
 device		pci
 
@@ -93,6 +94,6 @@ device		mvs
 device		nand
 
 # Flattened Device Tree
-options 	FDT
+options 	FDT			# Configure using FDT/DTB data
 options 	FDT_DTB_STATIC
 makeoptions	FDT_DTS_FILE=db88f6281.dts
diff --git a/sys/arm/conf/DOCKSTAR b/sys/arm/conf/DOCKSTAR
index 9e73980..16eeef9 100644
--- a/sys/arm/conf/DOCKSTAR
+++ b/sys/arm/conf/DOCKSTAR
@@ -24,33 +24,54 @@ ident		DOCKSTAR
 include 	"std.arm"
 include 	"../mv/kirkwood/std.db88f6xxx"
 
-makeoptions	FDT_DTS_FILE=dockstar.dts
-
 options 	SOC_MV_KIRKWOOD
 
 options 	SCHED_4BSD		# 4BSD scheduler
 options 	INET			# InterNETworking
 options 	INET6			# IPv6 communications protocols
-options 	SOFTUPDATES
-options 	CD9660			# ISO 9660 filesystem
 options 	FFS			# Berkeley Fast Filesystem
-options 	TMPFS			# Efficient memory filesystem
-options 	MSDOSFS			# MS DOS File System (FAT, FAT32)
+options 	SOFTUPDATES		# Enable FFS soft updates support
+options 	NFSCL			# 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 	NULLFS			# NULL filesystem
+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 	GEOM_LABEL		# Provides labelization
+options 	GEOM_ELI		# Disk encryption
 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 	GEOM_PART_BSD		# BSD partition scheme
-options 	GEOM_PART_MBR		# MBR partition scheme
-options 	GEOM_ELI		# Disk encryption.
-options 	GEOM_LABEL		# Providers labelization.
-options 	GEOM_PART_GPT		# GPT partitioning
+options 	_KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions
 
-# Flattened Device Tree
-device		fdt
-options 	FDT
-options 	FDT_DTB_STATIC
+# Debugging for use in -current
+makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
+options 	BREAK_TO_DEBUGGER
+options 	ALT_BREAK_TO_DEBUGGER
+options 	KDB			# Enable kernel debugger support
+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
+#options 	WITNESS			# Enable checks to detect deadlocks and cycles
+#options 	WITNESS_SKIPSPIN	# Don't run witness on spinlocks for speed
+#options 	WITNESS_KDB
+#options 	DIAGNOSTIC
+
+# Enable these options for nfs root configured via BOOTP.
+#options 	BOOTP
+#options 	BOOTP_NFSROOT
+#options 	BOOTP_NFSV3
+#options 	BOOTP_WIRED_TO=mge0
+
+# If not using BOOTP, use something like one of these...
+#options 	ROOTDEVNAME=\"ufs:/dev/da0a\"
+options 	ROOTDEVNAME=\"ufs:/dev/da0s1a\"
+#options 	ROOTDEVNAME=\"ufs:/dev/da0p10\"
+#options 	ROOTDEVNAME=\"nfs:192.168.0.254/dreamplug\"
 
 # Misc pseudo devices
 device		bpf			# Required for DHCP
@@ -138,31 +159,7 @@ options 	ALTQ_PRIQ		# Priority Queueing
 options 	ALTQ_NOPCC		# Required if the TSC is unusable
 #options 	ALTQ_DEBUG
 
-# Debugging
-makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
-options 	BREAK_TO_DEBUGGER
-options 	ALT_BREAK_TO_DEBUGGER
-options 	DDB
-options 	KDB
-#options 	DIAGNOSTIC
-options 	INVARIANTS		# Enable calls of extra sanity checking
-options 	INVARIANT_SUPPORT	# Extra sanity checks of internal structures, required by INVARIANTS
-#options 	WITNESS			# Enable checks to detect deadlocks and cycles
-#options 	WITNESS_SKIPSPIN	# Don't run witness on spinlocks for speed
-#options 	WITNESS_KDB
-
-# Enable these options for nfs root configured via BOOTP.
-options 	NFSCL			# Network Filesystem Client
-options 	NFSLOCKD		# Network Lock Manager
-#options 	NFS_ROOT		# NFS usable as /, requires NFSCL
-#options 	BOOTP
-#options 	BOOTP_NFSROOT
-#options 	BOOTP_NFSV3
-#options 	BOOTP_WIRED_TO=mge0
-
-# If not using BOOTP, use something like one of these...
-#options 	ROOTDEVNAME=\"ufs:/dev/da0a\"
-options 	ROOTDEVNAME=\"ufs:/dev/da0s1a\"
-#options 	ROOTDEVNAME=\"ufs:/dev/da0p10\"
-#options 	ROOTDEVNAME=\"nfs:192.168.0.254/dreamplug\"
-
+# Flattened Device Tree
+options 	FDT			# Configure using FDT/DTB data
+options 	FDT_DTB_STATIC
+makeoptions	FDT_DTS_FILE=dockstar.dts
diff --git a/sys/arm/conf/DREAMPLUG-1001 b/sys/arm/conf/DREAMPLUG-1001
index f44599e..247eadb 100644
--- a/sys/arm/conf/DREAMPLUG-1001
+++ b/sys/arm/conf/DREAMPLUG-1001
@@ -27,33 +27,54 @@ ident		DREAMPLUG-1001
 include 	"std.arm"
 include 	"../mv/kirkwood/std.db88f6xxx"
 
-makeoptions	FDT_DTS_FILE=dreamplug-1001.dts
-
 options 	SOC_MV_KIRKWOOD
 
 options 	SCHED_4BSD		# 4BSD scheduler
 options 	INET			# InterNETworking
 options 	INET6			# IPv6 communications protocols
-options 	SOFTUPDATES
-options 	TMPFS			# Efficient memory filesystem
-options 	CD9660			# ISO 9660 filesystem
 options 	FFS			# Berkeley Fast Filesystem
-options 	MSDOSFS			# MS DOS File System (FAT, FAT32)
+options 	SOFTUPDATES		# Enable FFS soft updates support
+options 	NFSCL			# 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 	NULLFS			# NULL filesystem
+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 	GEOM_LABEL		# Provides labelization
+options 	GEOM_ELI		# Disk encryption
 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 	GEOM_PART_BSD		# BSD partition scheme
-options 	GEOM_PART_MBR		# MBR partition scheme
-options 	GEOM_ELI		# Disk encryption.
-options 	GEOM_LABEL		# Providers labelization.
-options 	GEOM_PART_GPT		# GPT partitioning
+options 	_KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions
 
-# Flattened Device Tree
-device		fdt
-options 	FDT
-options 	FDT_DTB_STATIC
+# Debugging for use in -current
+makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
+options 	BREAK_TO_DEBUGGER
+options 	ALT_BREAK_TO_DEBUGGER
+options 	KDB			# Enable kernel debugger support
+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
+#options 	WITNESS			# Enable checks to detect deadlocks and cycles
+#options 	WITNESS_SKIPSPIN	# Don't run witness on spinlocks for speed
+#options 	WITNESS_KDB
+#options 	DIAGNOSTIC
+
+# Enable these options for nfs root configured via BOOTP.
+#options 	BOOTP
+#options 	BOOTP_NFSROOT
+#options 	BOOTP_NFSV3
+#options 	BOOTP_WIRED_TO=mge0
+
+# If not using BOOTP, use something like one of these...
+#options 	ROOTDEVNAME=\"ufs:/dev/da1a\"
+options 	ROOTDEVNAME=\"ufs:/dev/da1s1a\"
+#options 	ROOTDEVNAME=\"ufs:/dev/da1p10\"
+#options 	ROOTDEVNAME=\"nfs:192.168.0.254/dreamplug\"
 
 # Misc pseudo devices
 device		bpf			# Required for DHCP
@@ -146,34 +167,6 @@ options 	ALTQ_PRIQ		# Priority Queueing
 options 	ALTQ_NOPCC		# Required if the TSC is unusable
 #options 	ALTQ_DEBUG
 
-# Debugging
-makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
-options 	BREAK_TO_DEBUGGER
-options 	ALT_BREAK_TO_DEBUGGER
-options 	DDB
-options 	KDB
-#options 	DIAGNOSTIC
-options 	INVARIANTS		# Enable calls of extra sanity checking
-options 	INVARIANT_SUPPORT	# Extra sanity checks of internal structures, required by INVARIANTS
-#options 	WITNESS			# Enable checks to detect deadlocks and cycles
-#options 	WITNESS_SKIPSPIN	# Don't run witness on spinlocks for speed
-#options 	WITNESS_KDB
-
-# Enable these options for nfs root configured via BOOTP.
-options 	NFSCL			# Network Filesystem Client
-options 	NFSLOCKD		# Network Lock Manager
-#options 	NFS_ROOT		# NFS usable as /, requires NFSCL
-#options 	BOOTP
-#options 	BOOTP_NFSROOT
-#options 	BOOTP_NFSV3
-#options 	BOOTP_WIRED_TO=mge0
-
-# If not using BOOTP, use something like one of these...
-#options 	ROOTDEVNAME=\"ufs:/dev/da1a\"
-options 	ROOTDEVNAME=\"ufs:/dev/da1s1a\"
-#options 	ROOTDEVNAME=\"ufs:/dev/da1p10\"
-#options 	ROOTDEVNAME=\"nfs:192.168.0.254/dreamplug\"
-
 # To use this configuration with the (rare) model 1001N (nand flash),
 # create a kernel config file that looks like this:
 #
@@ -182,3 +175,7 @@ options 	ROOTDEVNAME=\"ufs:/dev/da1s1a\"
 # makeoptions	FDT_DTS_FILE=dreamplug-1001N.dts
 # device 	nand
 
+# Flattened Device Tree
+options 	FDT			# Configure using FDT/DTB data
+options 	FDT_DTB_STATIC
+makeoptions	FDT_DTS_FILE=dreamplug-1001.dts
diff --git a/sys/arm/conf/SHEEVAPLUG b/sys/arm/conf/SHEEVAPLUG
index 9797cc0..507ba75 100644
--- a/sys/arm/conf/SHEEVAPLUG
+++ b/sys/arm/conf/SHEEVAPLUG
@@ -11,45 +11,47 @@ include 	"../mv/kirkwood/std.db88f6xxx"
 
 options 	SOC_MV_KIRKWOOD
 
-#makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
 makeoptions	WERROR="-Werror"
 
+options 	HZ=1000
 options 	SCHED_4BSD		# 4BSD scheduler
 options 	INET			# InterNETworking
 options 	INET6			# IPv6 communications protocols
-options 	GEOM_PART_BSD		# BSD partition scheme
-options 	GEOM_PART_MBR		# MBR partition scheme
-options 	TMPFS			# Efficient memory filesystem
 options 	FFS			# Berkeley Fast Filesystem
 options 	NANDFS			# NAND Filesystem
 options 	NFSCL			# Network Filesystem Client
 options 	NFSLOCKD		# Network Lock Manager
 options 	NFS_ROOT		# NFS usable as /, requires NFSCL
-options 	BOOTP
-options 	BOOTP_NFSROOT
-options 	BOOTP_NFSV3
-options 	BOOTP_WIRED_TO=mge0
-
-# Root fs on USB device
-#options 	ROOTDEVNAME=\"ufs:/dev/da0a\"
-
+options 	TMPFS			# Efficient memory filesystem
+options 	GEOM_PART_BSD		# BSD partition scheme
+options 	GEOM_PART_MBR		# MBR partition scheme
 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 	MUTEX_NOINLINE
 options 	RWLOCK_NOINLINE
 options 	NO_FFS_SNAPSHOT
 options 	NO_SWAPPING
 
-# Debugging
+# Debugging for use in -current
+#makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
 options 	ALT_BREAK_TO_DEBUGGER
-options 	DDB
-options 	KDB
+options 	KDB			# Enable kernel debugger support
+options 	DDB			# Enable the kernel debugger
+
+# NFS root from boopt/dhcp
+options 	BOOTP
+options 	BOOTP_NFSROOT
+options 	BOOTP_NFSV3
+options 	BOOTP_WIRED_TO=mge0
+
+# Root fs on USB device
+#options 	ROOTDEVNAME=\"ufs:/dev/da0a\"
 
 # Pseudo devices
-device		random
 device		loop
+device		random
 
 # Serial ports
 device		uart
@@ -60,7 +62,6 @@ device		mge			# Marvell Gigabit Ethernet controller
 device		mii
 device		e1000phy
 device		bpf
-options 	HZ=1000
 options 	DEVICE_POLLING
 device		vlan
 
@@ -81,6 +82,6 @@ device		da
 device		nand
 
 # Flattened Device Tree
-options 	FDT
+options 	FDT			# Configure using FDT/DTB data
 options 	FDT_DTB_STATIC
 makeoptions	FDT_DTS_FILE=sheevaplug.dts