MFC r263245, r269233, r267101, r275961: Config style cleanups.

Some of these are effectively record-only merges, because the actual
merge happened during conflict resolution of some prior merge.

2 files changed, 95 insertions, 97 deletions

diff --git a/sys/arm/conf/IMX6 b/sys/arm/conf/IMX6
index 88a6462..cc4648f 100644
--- a/sys/arm/conf/IMX6
+++ b/sys/arm/conf/IMX6
@@ -21,140 +21,140 @@ ident		IMX6
 include 	"../freescale/imx/std.imx6"
 
 options  	HZ=500			# Scheduling quantum is 2 milliseconds.
-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  	MD_ROOT			# MD is a potential root device
-options  	NFSCL			# New Network Filesystem Client
-#options  	NFSD			# New Network Filesystem Server
-options  	NFSLOCKD		# Network Lock Manager
-options  	NFS_ROOT		# NFS usable as /, requires NFSCL
+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 	MD_ROOT			# MD is a potential root device
+options 	NFSCL			# New Network Filesystem Client
+#options 	NFSD			# New Network Filesystem Server
+options 	NFSLOCKD		# Network Lock Manager
+options 	NFS_ROOT		# NFS usable as /, requires NFSCL
 options 	TMPFS			# Efficient memory filesystem
-options  	MSDOSFS			# MSDOS Filesystem
-options  	CD9660			# ISO 9660 Filesystem
-#options  	PROCFS			# Process filesystem (requires PSEUDOFS)
-options  	PSEUDOFS		# Pseudo-filesystem framework
+options 	MSDOSFS			# MSDOS Filesystem
+options 	CD9660			# ISO 9660 Filesystem
+#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  	GEOM_PART_GPT		# GUID Partition Tables.
-options  	GEOM_LABEL		# Provides labelization
-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  	INCLUDE_CONFIG_FILE	# Include this file in kernel
+options 	GEOM_PART_GPT		# GUID Partition Tables.
+options 	GEOM_LABEL		# Provides labelization
+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 	INCLUDE_CONFIG_FILE	# Include this file in kernel
 
 # Debugging support.  Always need this:
-options  	KDB			# Enable kernel debugger support.
+options 	KDB			# Enable kernel debugger support.
 # For minimum debugger support use KDB_TRACE, for interactive use DDB.
-#options  	KDB_TRACE		# Print a stack trace for a panic.
-options  	DDB			# Support DDB.
+#options 	KDB_TRACE		# Print a stack trace for a panic.
+options 	DDB			# Support DDB.
 # For full debugger support use this instead:
-#options  	GDB			# Support remote GDB.
+#options 	GDB			# Support remote GDB.
 # Other debugging options...
 makeoptions  	DEBUG=-g		# Build kernel with gdb(1) debug symbols
-options  	ALT_BREAK_TO_DEBUGGER	# Use <CR><tilde><ctrl-b> to enter debugger.
-#options  	DEBUG
-#options  	DEADLKRES		# Enable the deadlock resolver
-#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 	ALT_BREAK_TO_DEBUGGER	# Use <CR><tilde><ctrl-b> to enter debugger.
+#options 	DEBUG
+#options 	DEADLKRES		# Enable the deadlock resolver
+#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
 
 # Pseudo devices.
-device  	loop			# Network loopback
-device  	random			# Entropy device
-device  	vlan			# 802.1Q VLAN support
-device  	tun			# Packet tunnel.
-device  	md			# Memory "disks"
-#device  	gif			# IPv6 and IPv4 tunneling
+device		loop			# Network loopback
+device		random			# Entropy device
+device		vlan			# 802.1Q VLAN support
+device		tun			# Packet tunnel.
+device		md			# Memory "disks"
 #device  	faith			# IPv6-to-IPv4 relaying (translation)
-#device  	firmware		# firmware assist module
-device  	ether			# Ethernet support
-device  	miibus			# Required for ethernet
-device  	bpf			# Berkeley packet filter (required for DHCP)
+#device		gif			# IPv6 and IPv4 tunneling
+#device		firmware		# firmware assist module
+device		ether			# Ethernet support
+device		miibus			# Required for ethernet
+device	 	bpf			# Berkeley packet filter (required for DHCP)
 
 # General-purpose input/output
 device  	gpio
 
 # Serial (COM) ports
-device  	uart			# Multi-uart driver
+device		uart			# Multi-uart driver
 
 # SDCard
-device  	sdhci			# SD controller
-device  	mmc			# SD/MMC protocol
-device  	mmcsd			# SDCard disk device
+device		sdhci			# SD controller
+device		mmc			# SD/MMC protocol
+device		mmcsd			# SDCard disk device
 
 # SCSI peripherals
-device  	scbus			# SCSI bus (required for ATA/SCSI)
-device  	da			# Direct Access (disks)
-device  	cd			# CD
-device  	pass			# Passthrough device (direct ATA/SCSI access)
+device		scbus			# SCSI bus (required for ATA/SCSI)
+device		da			# Direct Access (disks)
+device		cd			# CD
+device		pass			# Passthrough device (direct ATA/SCSI access)
 
 # USB support
-#options  	USB_DEBUG		# enable debug msgs
-device  	ehci			# OHCI USB interface
-device  	usb			# USB Bus (required)
-device  	umass			# Disks/Mass storage - Requires scbus and da
-device  	uhid			# "Human Interface Devices"
-device  	u3g			# USB modems
-#device  	ukbd			# Allow keyboard like HIDs to control console
-#device  	ums			# USB mouse
+#options 	USB_DEBUG		# enable debug msgs
+device		ehci			# OHCI USB interface
+device		usb			# USB Bus (required)
+device		umass			# Disks/Mass storage - Requires scbus and da
+device		uhid			# "Human Interface Devices"
+device		u3g			# USB modems
+#device		ukbd			# Allow keyboard like HIDs to control console
+#device		ums			# USB mouse
 
 # USB Ethernet, requires miibus
-#device  	aue			# ADMtek USB Ethernet
-#device  	axe			# ASIX Electronics USB Ethernet
-#device  	cdce			# Generic USB over Ethernet
-#device  	cue			# CATC USB Ethernet
-#device  	kue			# Kawasaki LSI USB Ethernet
-#device  	rue			# RealTek RTL8150 USB Ethernet
-#device  	udav			# Davicom DM9601E USB
+#device		aue			# ADMtek USB Ethernet
+#device		axe			# ASIX Electronics USB Ethernet
+#device		cdce			# Generic USB over Ethernet
+#device		cue			# CATC USB Ethernet
+#device		kue			# Kawasaki LSI USB Ethernet
+#device		rue			# RealTek RTL8150 USB Ethernet
+#device		udav			# Davicom DM9601E USB
 
 # USB Wireless
-#device  	rum			# Ralink Technology RT2501USB wireless NICs
+#device		rum			# Ralink Technology RT2501USB wireless NICs
 
 # Wireless NIC cards
-#device  	wlan			# 802.11 support
-#device  	wlan_wep		# 802.11 WEP support
-#device  	wlan_ccmp		# 802.11 CCMP support
-#device  	wlan_tkip		# 802.11 TKIP support
-#device  	wlan_amrr		# AMRR transmit rate control algorithm
+#device		wlan			# 802.11 support
+#device		wlan_wep		# 802.11 WEP support
+#device		wlan_ccmp		# 802.11 CCMP support
+#device		wlan_tkip		# 802.11 TKIP support
+#device		wlan_amrr		# AMRR transmit rate control algorithm
 
 # NOTE: serial console will be disabled if syscons enabled
 # Uncomment following lines for framebuffer/syscons support
 # Wandboard has no video console support yet.
-#device  	sc
-#device  	kbdmux
-#options  	SC_DFLT_FONT		# compile font in
-#makeoptions  	SC_DFLT_FONT=cp437
+#device		sc
+#device		kbdmux
+#options 	SC_DFLT_FONT		# compile font in
+#makeoptions	SC_DFLT_FONT=cp437
 
 # required for netbooting
-#options  	BOOTP
-#options  	BOOTP_COMPAT
-#options  	BOOTP_NFSROOT
-#options  	BOOTP_NFSV3
-#options  	BOOTP_WIRED_TO=ffec0
+#options 	BOOTP
+#options 	BOOTP_COMPAT
+#options	BOOTP_NFSROOT
+#options 	BOOTP_NFSV3
+#options 	BOOTP_WIRED_TO=ffec0
 
 # U-Boot stuff lives on slice 1, FreeBSD on slice 2.
-options  	ROOTDEVNAME=\"ufs:mmcsd0s2a\"
+options 	ROOTDEVNAME=\"ufs:mmcsd0s2a\"
 
 # ARM and SoC-specific options
-options  	FDT			# Configure using FDT/DTB data.
-options  	SMP			# Enable multiple cores
-options  	VFP			# Enable floating point hardware support
-options  	FREEBSD_BOOT_LOADER	# Process metadata passed from loader(8)
+options 	FDT			# Configure using FDT/DTB data.
+options 	SMP			# Enable multiple cores
+options 	VFP			# Enable floating point hardware support
+options 	FREEBSD_BOOT_LOADER	# Process metadata passed from loader(8)
 
 # SoC-specific devices
-device  	ffec			# Freescale Fast Ethernet Controller
-device  	fsliic			# Freescale i2c/iic
-device  	iic			# iic protocol
-device  	iicbus			# iic bus
-#device  	imxwdt			# Watchdog. WARNING: can't be disabled!!!
+device		ffec			# Freescale Fast Ethernet Controller
+device		fsliic			# Freescale i2c/iic
+device		iic			# iic protocol
+device		iicbus			# iic bus
+#device		imxwdt			# Watchdog. WARNING: can't be disabled!!!
 
diff --git a/sys/arm/conf/RPI-B b/sys/arm/conf/RPI-B
index 793dbc8..336b915 100644
--- a/sys/arm/conf/RPI-B
+++ b/sys/arm/conf/RPI-B
@@ -71,8 +71,6 @@ device		pty
 # Comment following lines for boot console on serial port
 device		vt
 device		kbdmux
-options         SC_DFLT_FONT		# compile font in
-makeoptions     SC_DFLT_FONT=cp437
 device		ukbd
 
 device		sdhci