MFC r266647, r270912, r273089:

  Reduce the diff between the PandaBoard and BeableBone kernel configs

  Resync comments about scbus and pass for life after AHCI joined CAM.

  Uncomment general options from the Pandaboard config. These are in other
  configs and there is no reason for them not to be here.

21 files changed, 91 insertions, 91 deletions

diff --git a/sys/arm/conf/BEAGLEBONE b/sys/arm/conf/BEAGLEBONE
index 465e497..30f9a48 100644
--- a/sys/arm/conf/BEAGLEBONE
+++ b/sys/arm/conf/BEAGLEBONE
@@ -53,7 +53,7 @@ options 	PREEMPTION
 options 	FREEBSD_BOOT_LOADER
 options 	VFP			# vfp/neon
 
-# Debugging
+# 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
@@ -78,12 +78,17 @@ options 	NFSLOCKD
 #options 	BOOTP_NFSV3
 #options 	BOOTP_WIRED_TO=cpsw0
 
-
-# MMC/SD/SDIO card slot support
+# MMC/SD/SDIO Card slot support
 device		mmc			# mmc/sd bus
 device		mmcsd			# mmc/sd flash cards
 device		sdhci			# mmc/sd host controller
 
+# I2C support
+device		iicbus
+device		iic
+device		ti_i2c
+device		am335x_pmic		# AM335x Power Management IC (TPC65217)
+
 # Boot device is 2nd slice on MMC/SD card
 options 	ROOTDEVNAME=\"ufs:mmcsd0s2\"
 
@@ -97,12 +102,6 @@ device		snp
 device		md
 device		random			# Entropy device
 
-# I2C support
-device		iicbus
-device		iic
-device		ti_i2c
-device		am335x_pmic		# AM335x Power Management IC (TPC65217)
-
 # GPIO
 device		gpio
 device		gpioled
@@ -124,13 +123,13 @@ device		ti_mbox
 
 # USB support
 device		usb
-options 	USB_HOST_ALIGN=64	# Cacheline size is 64 on AM335x.
+options 	USB_HOST_ALIGN=64	# Align usb buffers to cache line size.
 options 	USB_DEBUG
 #options 	USB_REQ_DEBUG
 #options 	USB_VERBOSE
 device		musb
 device		umass
-device		scbus			# SCSI bus (required for SCSI)
+device		scbus			# SCSI bus (required for ATA/SCSI)
 device		da			# Direct Access (disks)
 
 # Ethernet
@@ -141,7 +140,7 @@ device		smscphy
 device		cpsw
 device		bpf
 
-# USB ethernet support, requires miibus
+# USB Ethernet support, requires miibus
 device		miibus
 device		axe			# ASIX Electronics USB Ethernet
 
diff --git a/sys/arm/conf/CNS11XXNAS b/sys/arm/conf/CNS11XXNAS
index a93adad..53640ff 100644
--- a/sys/arm/conf/CNS11XXNAS
+++ b/sys/arm/conf/CNS11XXNAS
@@ -111,7 +111,7 @@ device		usb
 device		ohci
 device		ehci
 device		umass
-device		scbus			# SCSI bus (required for SCSI)
+device		scbus			# SCSI bus (required for ATA/SCSI)
 device		da			# Direct Access (disks)
 device		pass
 device 		cfi
diff --git a/sys/arm/conf/CUBIEBOARD b/sys/arm/conf/CUBIEBOARD
index 0d85379..cee54f6 100644
--- a/sys/arm/conf/CUBIEBOARD
+++ b/sys/arm/conf/CUBIEBOARD
@@ -104,7 +104,7 @@ device		random			# Entropy device
 # GPIO
 device		gpio
 
-device		scbus			# SCSI bus (required for SCSI)
+device		scbus			# SCSI bus (required for ATA/SCSI)
 device		da			# Direct Access (disks)
 device		pass
 
diff --git a/sys/arm/conf/CUBIEBOARD2 b/sys/arm/conf/CUBIEBOARD2
index 77fa811..0e148a1 100644
--- a/sys/arm/conf/CUBIEBOARD2
+++ b/sys/arm/conf/CUBIEBOARD2
@@ -104,7 +104,7 @@ device		random			# Entropy device
 # GPIO
 device		gpio
 
-device		scbus			# SCSI bus (required for SCSI)
+device		scbus			# SCSI bus (required for ATA/SCSI)
 device		da			# Direct Access (disks)
 device		pass
 
diff --git a/sys/arm/conf/DIGI-CCWMX53 b/sys/arm/conf/DIGI-CCWMX53
index 8834ba1..37b01eb 100644
--- a/sys/arm/conf/DIGI-CCWMX53
+++ b/sys/arm/conf/DIGI-CCWMX53
@@ -128,10 +128,10 @@ device		iic
 device		iicbus
 
 # SCSI peripherals
-device		scbus			# SCSI bus (required for SCSI)
+device		scbus			# SCSI bus (required for ATA/SCSI)
 device		da			# Direct Access (disks)
 device		cd			# CD
-device		pass			# Passthrough device (direct SCSI access)
+device		pass			# Passthrough device (direct ATA/SCSI access)
 
 # USB support
 options 	USB_HOST_ALIGN=64	# Align usb buffers to cache line size.
diff --git a/sys/arm/conf/EB9200 b/sys/arm/conf/EB9200
index 3e3d124..49f0676 100644
--- a/sys/arm/conf/EB9200
+++ b/sys/arm/conf/EB9200
@@ -102,10 +102,10 @@ device		ohci			# OHCI localbus->USB interface
 device		usb			# USB Bus (required)
 device		umass			# Disks/Mass storage - Requires scbus and da
 # SCSI peripherals
-device		scbus			# SCSI bus (required for SCSI)
+device		scbus			# SCSI bus (required for ATA/SCSI)
 device		da			# Direct Access (disks)
 device		cd			# CD
-device		pass			# Passthrough device (direct SCSI access)
+device		pass			# Passthrough device (direct ATA/SCSI access)
 
 # USB device (gadget) support
 #device		at91_dci		# Atmel's usb device
diff --git a/sys/arm/conf/EFIKA_MX b/sys/arm/conf/EFIKA_MX
index 4d750ac..85e180e 100644
--- a/sys/arm/conf/EFIKA_MX
+++ b/sys/arm/conf/EFIKA_MX
@@ -124,10 +124,10 @@ device		iic
 device		iicbus
 
 # SCSI peripherals
-device		scbus			# SCSI bus (required for SCSI)
+device		scbus			# SCSI bus (required for ATA/SCSI)
 device		da			# Direct Access (disks)
 device		cd			# CD
-device		pass			# Passthrough device (direct SCSI access)
+device		pass			# Passthrough device (direct ATA/SCSI access)
 
 # USB support
 options 	USB_HOST_ALIGN=64	# Align usb buffers to cache line size.
diff --git a/sys/arm/conf/EXYNOS5.common b/sys/arm/conf/EXYNOS5.common
index 8886b46..8b7a492 100644
--- a/sys/arm/conf/EXYNOS5.common
+++ b/sys/arm/conf/EXYNOS5.common
@@ -103,7 +103,7 @@ device		ehci
 #device		ohci
 
 device		umass
-device		scbus			# SCSI bus (required for SCSI)
+device		scbus			# SCSI bus (required for ATA/SCSI)
 device		da			# Direct Access (disks)
 device		pass
 
diff --git a/sys/arm/conf/HL200 b/sys/arm/conf/HL200
index 8e0d174..6c8140e 100644
--- a/sys/arm/conf/HL200
+++ b/sys/arm/conf/HL200
@@ -132,10 +132,10 @@ device		uath			# Atheros AR5523 wireless NICs
 device		ural			# Ralink Technology RT2500USB wireless NICs
 device		zyd			# ZyDAS zd1211/zd1211b wireless NICs
 # SCSI peripherals
-device		scbus			# SCSI bus (required for SCSI)
+device		scbus			# SCSI bus (required for ATA/SCSI)
 device		da			# Direct Access (disks)
 device		cd			# CD
-device		pass			# Passthrough device (direct SCSI access)
+device		pass			# Passthrough device (direct ATA/SCSI access)
 # Wireless NIC cards
 device		wlan			# 802.11 support
 device		wlan_wep		# 802.11 WEP support
diff --git a/sys/arm/conf/HL201 b/sys/arm/conf/HL201
index fb80bbe..f0f387c 100644
--- a/sys/arm/conf/HL201
+++ b/sys/arm/conf/HL201
@@ -112,10 +112,10 @@ device		udav			# Davicom DM9601E USB
 #device		ural			# Ralink Technology RT2500USB wireless NICs
 #device		zyd			# ZyDAS zd1211/zd1211b wireless NICs
 # SCSI peripherals
-device		scbus			# SCSI bus (required for SCSI)
+device		scbus			# SCSI bus (required for ATA/SCSI)
 device		da			# Direct Access (disks)
 device		cd			# CD
-device		pass			# Passthrough device (direct SCSI access)
+device		pass			# Passthrough device (direct ATA/SCSI access)
 # Wireless NIC cards
 #device		wlan			# 802.11 support
 #device		wlan_wep		# 802.11 WEP support
diff --git a/sys/arm/conf/IMX53-QSB b/sys/arm/conf/IMX53-QSB
index e912628..e4c3ad6 100644
--- a/sys/arm/conf/IMX53-QSB
+++ b/sys/arm/conf/IMX53-QSB
@@ -127,10 +127,10 @@ device		iic
 device		iicbus
 
 # SCSI peripherals
-device		scbus			# SCSI bus (required for SCSI)
+device		scbus			# SCSI bus (required for ATA/SCSI)
 device		da			# Direct Access (disks)
 device		cd			# CD
-device		pass			# Passthrough device (direct SCSI access)
+device		pass			# Passthrough device (direct ATA/SCSI access)
 
 # USB support
 options 	USB_HOST_ALIGN=64	# Align usb buffers to cache line size.
diff --git a/sys/arm/conf/IMX6 b/sys/arm/conf/IMX6
index 135e906..88a6462 100644
--- a/sys/arm/conf/IMX6
+++ b/sys/arm/conf/IMX6
@@ -93,10 +93,10 @@ device  	mmc			# SD/MMC protocol
 device  	mmcsd			# SDCard disk device
 
 # SCSI peripherals
-device  	scbus			# SCSI bus (required for SCSI)
+device  	scbus			# SCSI bus (required for ATA/SCSI)
 device  	da			# Direct Access (disks)
 device  	cd			# CD
-device  	pass			# Passthrough device (direct SCSI access)
+device  	pass			# Passthrough device (direct ATA/SCSI access)
 
 # USB support
 #options  	USB_DEBUG		# enable debug msgs
diff --git a/sys/arm/conf/KB920X b/sys/arm/conf/KB920X
index a758a66..eb05d00 100644
--- a/sys/arm/conf/KB920X
+++ b/sys/arm/conf/KB920X
@@ -132,10 +132,10 @@ device		uath			# Atheros AR5523 wireless NICs
 device		ural			# Ralink Technology RT2500USB wireless NICs
 device		zyd			# ZyDAS zd1211/zd1211b wireless NICs
 # SCSI peripherals
-device		scbus			# SCSI bus (required for SCSI)
+device		scbus			# SCSI bus (required for ATA/SCSI)
 device		da			# Direct Access (disks)
 device		cd			# CD
-device		pass			# Passthrough device (direct SCSI access)
+device		pass			# Passthrough device (direct ATA/SCSI access)
 # Wireless NIC cards
 device		wlan			# 802.11 support
 device		wlan_wep		# 802.11 WEP support
diff --git a/sys/arm/conf/NSLU b/sys/arm/conf/NSLU
index e54e63b..4f40c46 100644
--- a/sys/arm/conf/NSLU
+++ b/sys/arm/conf/NSLU
@@ -115,5 +115,5 @@ options 	USB_DEBUG
 device		ohci
 device		ehci
 device		umass
-device		scbus			# SCSI bus (required for SCSI)
+device		scbus			# SCSI bus (required for ATA/SCSI)
 device		da			# Direct Access (disks)
diff --git a/sys/arm/conf/PANDABOARD b/sys/arm/conf/PANDABOARD
index 2a35b48..08cc562 100644
--- a/sys/arm/conf/PANDABOARD
+++ b/sys/arm/conf/PANDABOARD
@@ -12,54 +12,40 @@
 # latest information.
 #
 # An exhaustive list of options and more detailed explanations of the
-# device lines is also present in the ../../conf/NOTES and NOTES files. 
-# If you are in doubt as to the purpose or necessity of a line, check first 
+# device lines is also present in the ../../conf/NOTES and NOTES files.
+# If you are in doubt as to the purpose or necessity of a line, check first
 # in NOTES.
 #
 # $FreeBSD$
 
 ident		PANDABOARD
 
-
-
 # This probably wants to move somewhere else.  Maybe we can create a basic
 # OMAP4340 config, then make a PANDABOARD config that includes the basic one,
 # adds the start addresses and custom devices plus pulls in this hints file.
 
-hints       "PANDABOARD.hints"
+hints		"PANDABOARD.hints"
 
-include     "../ti/omap4/pandaboard/std.pandaboard"
+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	DEBUG=-g		# Build kernel with gdb(1) debug symbols
 options 	HZ=100
-
 options 	SCHED_4BSD		# 4BSD scheduler
 options 	INET			# InterNETworking
-#options 	INET6			# IPv6 communications protocols
+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
-device		snp
-options 	BREAK_TO_DEBUGGER
-
-options 	NFSCL
-options 	NFS_ROOT		# NFS usable as /, requires NFSCLIENT
-#options 	BOOTP_NFSROOT
-#options 	BOOTP_COMPAT
-#options 	BOOTP
-#options 	BOOTP_NFSV3
-#options 	BOOTP_WIRED_TO=ue0
 options 	GEOM_PART_BSD		# BSD partition scheme
 options 	GEOM_PART_MBR		# MBR partition scheme
 options 	TMPFS			# Efficient memory filesystem
 options 	MSDOSFS			# MSDOS Filesystem
-#options 	CD9660			# ISO 9660 Filesystem
-#options 	PROCFS			# Process filesystem (requires PSEUDOFS)
+options 	CD9660			# ISO 9660 Filesystem
+options 	PROCFS			# Process filesystem (requires PSEUDOFS)
 options 	PSEUDOFS		# Pseudo-filesystem framework
 options 	COMPAT_43		# Compatible with BSD 4.3 [KEEP THIS!]
 options 	SCSI_DELAY=5000		# Delay (in ms) before probing SCSI
@@ -69,9 +55,33 @@ options 	SYSVMSG			# SYSV-style message queues
 options 	SYSVSEM			# SYSV-style semaphores
 options 	_KPOSIX_PRIORITY_SCHEDULING # Posix P1003_1B real-time extensions
 options 	KBD_INSTALL_CDEV	# install a CDEV entry in /dev
+options 	PREEMPTION
 options 	FREEBSD_BOOT_LOADER
+options 	VFP			# vfp/neon
+options  	SMP			# Enable multiple cores
 
-options 	PREEMPTION
+# 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 	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
+
+# NFS root
+options 	NFS_ROOT		# NFS usable as /, requires NFSCLIENT
+#options 	BOOTP_NFSROOT
+#options 	BOOTP_COMPAT
+#options 	BOOTP
+#options 	BOOTP_NFSV3
+#options 	BOOTP_WIRED_TO=ue0
 
 # MMC/SD/SDIO Card slot support
 device		mmc			# mmc/sd bus
@@ -83,56 +93,50 @@ device		iicbus
 device		iic
 device		ti_i2c
 
-device		loop
-device		ether
-device		mii
-device		smc
-device		smcphy
+# Console and misc
 device		uart
 device		uart_ns8250
-
-device		gpio
-
 device		pty
-
+device		snp
+device		md
+device		random			# Entropy device
 device		pl310			# PL310 L2 cache controller
-# Debugging for use in -current
-#options 	VERBOSE_SYSINIT		# Enable verbose sysinit messages
-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 	DIAGNOSTIC
 
-device		md
+# GPIO
+device		gpio
 
 # The following enables MFS as root, this seems similar to an initramfs or initrd
 # as used in Linux.
 #options 	MD_ROOT
 #options 	MD_ROOT_SIZE=7560
 
-device		random			# Entropy device
+
 
 # USB support
-options 	USB_HOST_ALIGN=64	# Align usb buffers to cache line size.
 device		usb
+options 	USB_HOST_ALIGN=64	# Align usb buffers to cache line size.
 options 	USB_DEBUG
 #options 	USB_REQ_DEBUG
 #options 	USB_VERBOSE
 device		ohci
 device		ehci
 device		umass
-device		scbus			# SCSI bus (required for SCSI)
+device		scbus			# SCSI bus (required for ATA/SCSI)
 device		da			# Direct Access (disks)
 
+# Ethernet
+device		loop
+device		ether
+device		mii
+device		smc
+device		smcphy
+device		bpf
 
 # USB Ethernet support, requires miibus
 device		miibus
 #device		axe			# ASIX Electronics USB Ethernet
 device		smsc			# SMSC LAN95xx USB Ethernet
-device		bpf
+
 
 # OMAP-specific devices
 device		ti_sdma
@@ -144,6 +148,3 @@ device		twl_clks
 options         FDT
 options         FDT_DTB_STATIC
 makeoptions     FDT_DTS_FILE=pandaboard.dts
-
-options 	VFP			# vfp/neon
-options  	SMP			# Enable multiple cores
diff --git a/sys/arm/conf/QILA9G20 b/sys/arm/conf/QILA9G20
index 257e37d..39873f7 100644
--- a/sys/arm/conf/QILA9G20
+++ b/sys/arm/conf/QILA9G20
@@ -117,10 +117,10 @@ device		iicbus
 device		icee
 
 # SCSI peripherals
-device		scbus			# SCSI bus (required for SCSI)
+device		scbus			# SCSI bus (required for ATA/SCSI)
 device		da			# Direct Access (disks)
 device		cd			# CD
-device		pass			# Passthrough device (direct SCSI access)
+device		pass			# Passthrough device (direct ATA/SCSI access)
 
 # USB support
 device		ohci			# OHCI localbus->USB interface
diff --git a/sys/arm/conf/SAM9G20EK b/sys/arm/conf/SAM9G20EK
index 3c29f35..b37a52c 100644
--- a/sys/arm/conf/SAM9G20EK
+++ b/sys/arm/conf/SAM9G20EK
@@ -119,10 +119,10 @@ device		iicbus
 device		icee
 
 # SCSI peripherals
-device		scbus			# SCSI bus (required for SCSI)
+device		scbus			# SCSI bus (required for ATA/SCSI)
 device		da			# Direct Access (disks)
 device		cd			# CD
-device		pass			# Passthrough device (direct SCSI access)
+device		pass			# Passthrough device (direct ATA/SCSI access)
 
 # USB support
 device		ohci			# OHCI localbus->USB interface
diff --git a/sys/arm/conf/SAM9X25EK b/sys/arm/conf/SAM9X25EK
index d4b6343..e3f5933 100644
--- a/sys/arm/conf/SAM9X25EK
+++ b/sys/arm/conf/SAM9X25EK
@@ -118,10 +118,10 @@ device		iicbus
 device		icee
 
 # SCSI peripherals
-device		scbus			# SCSI bus (required for SCSI)
+device		scbus			# SCSI bus (required for ATA/SCSI)
 device		da			# Direct Access (disks)
 device		cd			# CD
-device		pass			# Passthrough device (direct SCSI access)
+device		pass			# Passthrough device (direct ATA/SCSI access)
 
 # USB support
 #device		ohci			# OHCI localbus->USB interface
diff --git a/sys/arm/conf/SN9G45 b/sys/arm/conf/SN9G45
index 3eb646b..2f4fa99 100644
--- a/sys/arm/conf/SN9G45
+++ b/sys/arm/conf/SN9G45
@@ -95,10 +95,10 @@ option 		AT91_ATE_USE_RMII
 device		at91_wdt		# WDT: Watchdog timer
 
 # SCSI peripherals
-device		scbus			# SCSI bus (required for SCSI)
+device		scbus			# SCSI bus (required for ATA/SCSI)
 device		da			# Direct Access (disks)
 device		cd			# CD
-device		pass			# Passthrough device (direct SCSI access)
+device		pass			# Passthrough device (direct ATA/SCSI access)
 
 # USB support
 device		ohci			# OHCI localbus->USB interface
diff --git a/sys/arm/conf/VYBRID b/sys/arm/conf/VYBRID
index 43cdac5..b1ad354 100644
--- a/sys/arm/conf/VYBRID
+++ b/sys/arm/conf/VYBRID
@@ -112,7 +112,7 @@ device		ehci
 #device		ohci
 
 device		umass
-device		scbus			# SCSI bus (required for SCSI)
+device		scbus			# SCSI bus (required for ATA/SCSI)
 device		da			# Direct Access (disks)
 device		pass
 
diff --git a/sys/arm/conf/ZEDBOARD b/sys/arm/conf/ZEDBOARD
index c391af4..8ec0df1 100644
--- a/sys/arm/conf/ZEDBOARD
+++ b/sys/arm/conf/ZEDBOARD
@@ -92,7 +92,7 @@ options 	USB_DEBUG
 #options 	USB_VERBOSE
 device		ehci
 device		umass
-device		scbus			# SCSI bus (required for SCSI)
+device		scbus			# SCSI bus (required for ATA/SCSI)
 device		da			# Direct Access (disks)
 device		axe			# USB-Ethernet