Update the ODROIDC1 and VSATV102 to reduce the diff to the other armv6

kernel config files.

2 files changed, 116 insertions, 96 deletions

diff --git a/sys/arm/conf/ODROIDC1 b/sys/arm/conf/ODROIDC1
index 7d70fa4..f0f5ec4 100644
--- a/sys/arm/conf/ODROIDC1
+++ b/sys/arm/conf/ODROIDC1
@@ -1,7 +1,7 @@
 # ODROIDC1 -- Custom configuration for the HardKernel ODROID-C1 SBC
 #
-# 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
 #
@@ -19,50 +19,60 @@
 
 ident		ODROIDC1
 
-include		"../amlogic/aml8726/std.odroidc1"
-
-options		HZ=100
-options		SCHED_ULE		# ULE scheduler
-options		PREEMPTION		# Enable kernel thread preemption
-options		INET			# InterNETworking
-options		INET6			# IPv6 communications protocols
-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		PROCFS			# Process filesystem (requires PSEUDOFS)
-options		PSEUDOFS		# Pseudo-filesystem framework
-options		GEOM_PART_BSD		# BSD partition scheme
-options		GEOM_PART_MBR		# MBR partition scheme
-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		PRINTF_BUFR_SIZE=128	# Prevent printf output being interspersed.
-options		KBD_INSTALL_CDEV	# install a CDEV entry in /dev
-options		LINUX_BOOT_ABI
-options		VFP			# vfp/neon
+include 	"../amlogic/aml8726/std.odroidc1"
+
+options 	HZ=100
+options 	SCHED_ULE		# ULE 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 	UFS_GJOURNAL		# Enable gjournal-based UFS journaling
+options 	QUOTA			# Enable disk quotas for UFS
+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 	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 	PRINTF_BUFR_SIZE=128	# Prevent printf output being interspersed.
+options 	KBD_INSTALL_CDEV	# install a CDEV entry in /dev
+options 	FREEBSD_BOOT_LOADER	# Process metadata passed from loader(8)
+options 	LINUX_BOOT_ABI
+options 	VFP			# Enable floating point hardware support
 
 # Debugging
 makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
-options		ALT_BREAK_TO_DEBUGGER
+options 	ALT_BREAK_TO_DEBUGGER
 #options 	VERBOSE_SYSINIT		# Enable verbose sysinit messages
-options		BOOTVERBOSE=1
-options		KDB
-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 	BOOTVERBOSE=1
+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
+options 	WITNESS			# Enable checks to detect deadlocks and cycles
+options 	WITNESS_SKIPSPIN	# Don't run witness on spinlocks for speed
 #options 	DIAGNOSTIC
 
-# NFS support
-#options 	NFSCL			# New Network Filesystem Client
-#options 	NFSLOCKD		# Network Lock Manager
-#options 	NFS_ROOT		# NFS usable as /, requires NFSCL
-
 # NFS root from boopt/dhcp
 #options 	BOOTP
 #options 	BOOTP_NFSROOT
@@ -70,12 +80,12 @@ options		WITNESS_SKIPSPIN	# Don't run witness on spinlocks for speed
 #options 	BOOTP_NFSV3
 #options 	BOOTP_WIRED_TO=axe0
 
-# MMC/SD/SDIO card slot support
+# MMC/SD/SDIO Card slot support
 device		mmc			# mmc/sd bus
 device		mmcsd			# mmc/sd flash cards
 
 # Boot device is 2nd slice on MMC/SD card
-options		ROOTDEVNAME=\"ufs:mmcsd0s2\"
+options 	ROOTDEVNAME=\"ufs:mmcsd0s2\"
 
 # GPIO
 device		gpio
@@ -107,8 +117,8 @@ device		bpf			# Berkeley packet filter
 # USB support
 device		usb			# General USB code (mandatory for USB)
 device		dwcotg			# DWC OTG controller
-options		USB_HOST_ALIGN=64	# Cacheline size is 64
-options		USB_DEBUG
+options 	USB_HOST_ALIGN=64	# Align usb buffers to cache line size.
+options 	USB_DEBUG
 #options 	USB_REQ_DEBUG
 #options 	USB_VERBOSE
 
@@ -125,9 +135,9 @@ device		miibus			# MII bus support
 # SoC Ethernet, requires miibus
 device		dwc
 
-# USB Ethernet, requires miibus
+# USB Ethernet support, requires miibus
 device		axe			# ASIX Electronics USB Ethernet
 
 # Flattened Device Tree
-options		FDT
-options		FDT_DTB_STATIC
+options 	FDT			# Configure using FDT/DTB data
+options 	FDT_DTB_STATIC
diff --git a/sys/arm/conf/VSATV102 b/sys/arm/conf/VSATV102
index a3df9fa..68e3bcd 100644
--- a/sys/arm/conf/VSATV102
+++ b/sys/arm/conf/VSATV102
@@ -1,7 +1,7 @@
 # VSATV102 -- Custom configuration for the Visson ATV-102 media player
 #
-# 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
 #
@@ -17,52 +17,62 @@
 #
 # $FreeBSD$
 
-ident		VSATV102
-
-include		"../amlogic/aml8726/std.vsatv102-m6"
-
-options		HZ=100
-options		SCHED_ULE		# ULE scheduler
-options		PREEMPTION		# Enable kernel thread preemption
-options		INET			# InterNETworking
-options		INET6			# IPv6 communications protocols
-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		PROCFS			# Process filesystem (requires PSEUDOFS)
-options		PSEUDOFS		# Pseudo-filesystem framework
-options		GEOM_PART_BSD		# BSD partition scheme
-options		GEOM_PART_MBR		# MBR partition scheme
-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		PRINTF_BUFR_SIZE=128	# Prevent printf output being interspersed.
-options		KBD_INSTALL_CDEV	# install a CDEV entry in /dev
-options		LINUX_BOOT_ABI
-options		VFP			# vfp/neon
+ident		ODROIDC1
+
+include 	"../amlogic/aml8726/std.vsatv102-m6"
+
+options 	HZ=100
+options 	SCHED_ULE		# ULE 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 	UFS_GJOURNAL		# Enable gjournal-based UFS journaling
+options 	QUOTA			# Enable disk quotas for UFS
+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 	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 	PRINTF_BUFR_SIZE=128	# Prevent printf output being interspersed.
+options 	KBD_INSTALL_CDEV	# install a CDEV entry in /dev
+options 	FREEBSD_BOOT_LOADER	# Process metadata passed from loader(8)
+options 	LINUX_BOOT_ABI
+options 	VFP			# Enable floating point hardware support
 
 # Debugging
 makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
-options		ALT_BREAK_TO_DEBUGGER
+options 	ALT_BREAK_TO_DEBUGGER
 #options 	VERBOSE_SYSINIT		# Enable verbose sysinit messages
-options		BOOTVERBOSE=1
-options		KDB
-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 	BOOTVERBOSE=1
+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
+options 	WITNESS			# Enable checks to detect deadlocks and cycles
+options 	WITNESS_SKIPSPIN	# Don't run witness on spinlocks for speed
 #options 	DIAGNOSTIC
 
-# NFS support
-#options 	NFSCL			# New Network Filesystem Client
-#options 	NFSLOCKD		# Network Lock Manager
-#options 	NFS_ROOT		# NFS usable as /, requires NFSCL
-
 # NFS root from boopt/dhcp
 #options 	BOOTP
 #options 	BOOTP_NFSROOT
@@ -70,12 +80,12 @@ options		WITNESS_SKIPSPIN	# Don't run witness on spinlocks for speed
 #options 	BOOTP_NFSV3
 #options 	BOOTP_WIRED_TO=axe0
 
-# MMC/SD/SDIO card slot support
+# MMC/SD/SDIO Card slot support
 device		mmc			# mmc/sd bus
 device		mmcsd			# mmc/sd flash cards
 
 # Boot device is 2nd slice on MMC/SD card
-options		ROOTDEVNAME=\"ufs:mmcsd0s2\"
+options 	ROOTDEVNAME=\"ufs:mmcsd0s2\"
 
 # GPIO
 device		gpio
@@ -107,8 +117,8 @@ device		bpf			# Berkeley packet filter
 # USB support
 device		usb			# General USB code (mandatory for USB)
 device		dwcotg			# DWC OTG controller
-options		USB_HOST_ALIGN=64	# Cacheline size is 64
-options		USB_DEBUG
+options 	USB_HOST_ALIGN=64	# Align usb buffers to cache line size.
+options 	USB_DEBUG
 #options 	USB_REQ_DEBUG
 #options 	USB_VERBOSE
 
@@ -125,9 +135,9 @@ device		miibus			# MII bus support
 # SoC Ethernet, requires miibus
 device		dwc
 
-# USB Ethernet, requires miibus
+# USB Ethernet support, requires miibus
 device		axe			# ASIX Electronics USB Ethernet
 
 # Flattened Device Tree
-options		FDT
-options		FDT_DTB_STATIC
+options 	FDT			# Configure using FDT/DTB data
+options 	FDT_DTB_STATIC