Pass over the at91 kernels to reduce the diff between them.

10 files changed, 468 insertions, 356 deletions

diff --git a/sys/arm/conf/BWCT b/sys/arm/conf/BWCT
index a6f8e49..a539923 100644
--- a/sys/arm/conf/BWCT
+++ b/sys/arm/conf/BWCT
@@ -31,10 +31,6 @@ hints		"BWCT.hints"
 makeoptions	MODULES_OVERRIDE=""
 
 #makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
-options 	DDB
-options 	KDB
-options 	BREAK_TO_DEBUGGER
-options 	ALT_BREAK_TO_DEBUGGER
 
 options 	SCHED_4BSD		# 4BSD scheduler
 options 	INET			# InterNETworking
@@ -45,43 +41,27 @@ options 	SOFTUPDATES		# Enable FFS soft updates support
 #options 	UFS_DIRHASH		# Improve performance on big directories
 #options 	MD_ROOT			# MD is a potential root device
 #options 	MD_ROOT_SIZE=4096	# 4MB ram disk
-#options 	ROOTDEVNAME=\"ufs:md0\"
-#options 	ROOTDEVNAME=\"ufs:/dev/mmcsd0s1a\"
 options 	NFSCL			# Network Filesystem Client
 #options 	NFSD			# Network Filesystem Server
 #options 	NFSLOCKD		# Network Lock Manager
 options 	NFS_ROOT		# NFS usable as /, requires NFSCL
-options 	BOOTP_NFSROOT
-options 	BOOTP
-
-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 	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 	NO_SYSCTL_DESCR
-options 	MUTEX_NOINLINE
-options 	RWLOCK_NOINLINE
-options 	NO_FFS_SNAPSHOT
-options 	NO_SWAPPING
-device		loop
-device		random
-device		ether
-device		vlan
-device		uart
-device		ate
-device		mii
-device		rlswitch
+options 	_KPOSIX_PRIORITY_SCHEDULING #POSIX P1003_1B real-time extensions
 
 # Debugging for use in -current
+options 	KDB			# Enable kernel debugger support
+options 	DDB			# Enable the kernel debugger
 #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
@@ -89,27 +69,64 @@ device		rlswitch
 #options 	WITNESS_SKIPSPIN	# Don't run witness on spinlocks for speed
 #options 	DIAGNOSTIC
 
-device		md
-device		at91_twi		# TWI: Two Wire Interface
-device		at91_spi		# SPI:
-device		at91_ssc
-device		at91_mci
-device		mmc			# mmc/sd bus
-device		mmcsd			# mmc/sd flash cards
-# iic
-device		iic
-device		iicbus
+options 	BOOTP
+options 	BOOTP_NFSROOT
+
+#options 	ROOTDEVNAME=\"ufs:md0\"
+#options 	ROOTDEVNAME=\"ufs:/dev/mmcsd0s1a\"
+
+# kernel/memory size reduction
+options 	MUTEX_NOINLINE
+options 	NO_FFS_SNAPSHOT
+options 	NO_SWAPPING
+#options 	NO_SYSCTL_DESCR
+options 	RWLOCK_NOINLINE
+
+# The `bpf' device enables the Berkeley Packet Filter.
+# Be aware of the administrative consequences of enabling this!
+# Note that 'bpf' is required for DHCP.
+device		bpf			# Berkeley packet filter
+
+# Ethernet
+device		mii			# Minimal MII support
+device		ate			# Atmel AT91 Ethernet driver
+device		rlswitch
+
+# I2C
+device		at91_twi		# Atmel AT91 Two-wire Interface
+device		iic			# I2C generic I/O device driver
+device		iicbus			# I2C bus system
 device		ds1672			# DS1672 on I2C bus
 #device		iicsmb			# smb over i2c bridge
 #device		smbus			# Bus support, required for smb below.
 #device		smb
-# SPI bus
-device		spibus
-#device		at45d			# at45db642 and maybe others
 
-device		bpf			# Berkeley packet filter
+# MMC/SD
+device		at91_mci		# Atmel AT91 Multimedia Card Interface
+device		mmc			# MMC/SD bus
+device		mmcsd			# MMC/SD memory card
+
+# DataFlash
+device		at91_spi		# Atmel AT91 Serial Peripheral Interface
+device		spibus			# SPI bus
+#device		at45d			# Atmel AT45D
+
+# Pseudo devices.
+device		loop			# Network loopback
+device		random			# Entropy device
+device		ether			# Ethernet support
+device		vlan			# 802.1Q VLAN support
+device		md			# Memory "disks"
 
+# Serial (COM) ports
+device		uart			# Multi-uart driver
+options 	BREAK_TO_DEBUGGER
+options 	ALT_BREAK_TO_DEBUGGER
+
+# USB support
 #options USB_DEBUG
 #device		ohci
 #device		usb
 #device		umass			# Disks/Mass storage - Requires scbus and da
+
+device		at91_ssc
diff --git a/sys/arm/conf/EB9200 b/sys/arm/conf/EB9200
index afcc530..6625783 100644
--- a/sys/arm/conf/EB9200
+++ b/sys/arm/conf/EB9200
@@ -24,8 +24,6 @@ hints		"EB9200.hints"
 makeoptions	MODULES_OVERRIDE=""
 
 makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
-options 	DDB
-options 	KDB
 
 options 	SCHED_4BSD		# 4BSD scheduler
 options 	INET			# InterNETworking
@@ -41,75 +39,92 @@ options 	NFSCL			# Network Filesystem Client
 options 	NFSD			# Network Filesystem Server
 options 	NFSLOCKD		# Network Lock Manager
 options 	NFS_ROOT		# NFS usable as /, requires NFSCL
-options 	BOOTP_NFSROOT
-options 	BOOTP
-
-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 	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 	NO_SYSCTL_DESCR
+options 	_KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions
+
+# Debugging for use in -current
+options 	KDB			# Enable kernel debugger support
+options 	DDB			# Enable the kernel debugger
+#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 	WITNESS_SKIPSPIN	# Don't run witness on spinlocks for speed
+
+# NFS root from boopt/dhcp
+options 	BOOTP
+options 	BOOTP_NFSROOT
+
 # Disable the inlining of mutex, rwlock and sx locks.  These eat up a lot
 # of space.
 options 	MUTEX_NOINLINE
-options 	RWLOCK_NOINLINE
 options 	SX_NOINLINE
 options 	NO_FFS_SNAPSHOT
 options 	NO_SWAPPING
-device		random
-device		loop
-device		ether
-device		uart
-device		ate
+#options 	NO_SYSCTL_DESCR
+options 	RWLOCK_NOINLINE
+
+# The `bpf' device enables the Berkeley Packet Filter.
+# Be aware of the administrative consequences of enabling this!
+# Note that 'bpf' is required for DHCP.
+device		bpf			# Berkeley packet filter
+
+# Ethernet
+device		ate			# Atmel AT91 Ethernet driver
 device		miibus
 #device		lxtphy
 
-device		at91_cfata
-device		ata
-
-# Debugging for use in -current
-#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 	WITNESS_SKIPSPIN	# Don't run witness on spinlocks for speed
+# I2C
+device		at91_twi		# Atmel AT91 Two-wire Interface
+device		iic			# I2C generic I/O device driver
+device		iicbus			# I2C bus system
+device		icee
 
-device		md
-device		at91_twi		# TWI: Two Wire Interface
-device		at91_spi		# SPI:
-device		spibus
 # MMC/SD
-device		at91_mci
-device		mmc
-device		mmcsd
-# iic
-device		iic
-device		iicbus
-device		icee
+device		at91_mci		# Atmel AT91 Multimedia Card Interface
+device		mmc			# MMC/SD bus
+device		mmcsd			# MMC/SD memory card
+
+device		at91_spi		# Atmel AT91 Serial Peripheral Interface
+device		spibus			# SPI bus
+
+# Pseudo devices.
+device		loop			# Network loopback
+device		random			# Entropy device
+device		ether			# Ethernet support
+device		md			# Memory "disks"
 
-device		bpf
-# USB support
-options 	USB_DEBUG		# enable debug msgs
-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 ATA/SCSI)
 device		da			# Direct Access (disks)
 device		cd			# CD
 device		pass			# Passthrough device (direct ATA/SCSI access)
 
+# Serial (COM) ports
+device		uart			# Multi-uart driver
+
+# USB support
+options 	USB_DEBUG		# enable debug msgs
+device		ohci			# OHCI USB interface
+device		usb			# USB Bus (required)
+device		umass			# Disks/Mass storage - Requires scbus and da
+
 # USB device (gadget) support
 #device		at91_dci		# Atmel's usb device
 #device		usfs			# emulate a flash
 #device		cdce			# emulate an ethernet
 #device		usb_template		# Control of the gadget
+
+device		at91_cfata
+device		ata
diff --git a/sys/arm/conf/ETHERNUT5 b/sys/arm/conf/ETHERNUT5
index c91869a..4604ff2 100644
--- a/sys/arm/conf/ETHERNUT5
+++ b/sys/arm/conf/ETHERNUT5
@@ -44,13 +44,13 @@ options 	NFSCL			# Network Filesystem Client
 #options 	NFSD			# Network Filesystem Server
 options 	NFSLOCKD		# Network Lock Manager
 options 	NFS_ROOT		# NFS usable as /, requires NFSCL
-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 	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 	COMPAT_FREEBSD5		# Compatible with FreeBSD5
@@ -71,10 +71,24 @@ options 	PRINTF_BUFR_SIZE=128	# Prevent printf output being interspersed.
 #options 	MAC			# TrustedBSD MAC Framework
 #options 	INCLUDE_CONFIG_FILE	# Include this file in kernel
 
-# required for netbooting
+# Debugging support.  Always need this:
+#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 	GDB			# Support remote GDB
+#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 	WITNESS_SKIPSPIN	# Don't run witness on spinlocks for speed
+#options 	MALLOC_DEBUG_MAXZONES=8	# Separate malloc(9) zones
+
+# NFS root from boopt/dhcp
 options 	BOOTP
-options 	BOOTP_COMPAT
 options 	BOOTP_NFSROOT
+options 	BOOTP_COMPAT
 options 	BOOTP_NFSV3
 options 	BOOTP_WIRED_TO=ate0
 
@@ -88,20 +102,6 @@ options 	NO_SWAPPING
 options 	NO_SYSCTL_DESCR
 options 	RWLOCK_NOINLINE
 
-# Debugging support.  Always need this:
-#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			# Support DDB.
-#options 	GDB			# Support remote GDB.
-#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 	WITNESS_SKIPSPIN	# Don't run witness on spinlocks for speed
-#options 	MALLOC_DEBUG_MAXZONES=8	# Separate malloc(9) zones
-
 # The `bpf' device enables the Berkeley Packet Filter.
 # Be aware of the administrative consequences of enabling this!
 # Note that 'bpf' is required for DHCP.
diff --git a/sys/arm/conf/HL200 b/sys/arm/conf/HL200
index 43a8148..091ab39 100644
--- a/sys/arm/conf/HL200
+++ b/sys/arm/conf/HL200
@@ -29,8 +29,6 @@ hints		"KB920X.hints"
 makeoptions	MODULES_OVERRIDE=""
 
 makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
-options 	DDB
-options 	KDB
 
 options 	SCHED_4BSD		# 4BSD scheduler
 options 	INET			# InterNETworking
@@ -41,67 +39,92 @@ options 	FFS			# Berkeley Fast Filesystem
 #options 	UFS_DIRHASH		# Improve performance on big directories
 #options 	MD_ROOT			# MD is a potential root device
 #options 	MD_ROOT_SIZE=4096	# 4MB ram disk
-#options 	ROOTDEVNAME=\"ufs:/dev/mmcsd0s1a\"
 options 	NFSCL			# Network Filesystem Client
 #options 	NFSD			# Network Filesystem Server
 #options 	NFSLOCKD		# Network Lock Manager
 options 	NFS_ROOT		# NFS usable as /, requires NFSCL
-options 	BOOTP_NFSROOT
-options 	BOOTP
-options 	BOOTP_NFSV3
-options 	BOOTP_WIRED_TO=ate0
-options 	BOOTP_COMPAT
-
-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 	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 	NO_SYSCTL_DESCR
-options 	MUTEX_NOINLINE
-options 	RWLOCK_NOINLINE
-options 	NO_FFS_SNAPSHOT
-options 	NO_SWAPPING
-device		random
-device		loop
-device		ether
-device		uart
-device		ate
-device		mii
-device		lxtphy
+options 	_KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions
 
 # Debugging for use in -current
+options 	KDB			# Enable kernel debugger support
+options 	DDB			# Enable the kernel debugger
 #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 	WITNESS_SKIPSPIN	# Don't run witness on spinlocks for speed
 
-device		md
-device		at91_twi		# TWI: Two Wire Interface
-device		at91_spi		# SPI:
-device		spibus
-# MMC/SD
-device		at91_mci
-device		mmc
-device		mmcsd
-# iic
-device		iic
-device		iicbus
+options 	BOOTP
+options 	BOOTP_NFSROOT
+options 	BOOTP_COMPAT
+options 	BOOTP_NFSV3
+options 	BOOTP_WIRED_TO=ate0
+
+# alternatively, boot from a MMC/SD memory card
+#options 	ROOTDEVNAME=\"ufs:/dev/mmcsd0s1a\"
+
+# kernel/memory size reduction
+options 	MUTEX_NOINLINE
+options 	NO_FFS_SNAPSHOT
+options 	NO_SWAPPING
+#options 	NO_SYSCTL_DESCR
+options 	RWLOCK_NOINLINE
+
+# The `bpf' device enables the Berkeley Packet Filter.
+# Be aware of the administrative consequences of enabling this!
+# Note that 'bpf' is required for DHCP.
+device		bpf			# Berkeley packet filter
+
+# Ethernet
+device		mii			# Minimal MII support
+device		ate			# Atmel AT91 Ethernet driver
+device		lxtphy
+
+# I2C
+device		at91_twi		# Atmel AT91 Two-wire Interface
+device		iic			# I2C generic I/O device driver
+device		iicbus			# I2C bus system
 device		icee
 
-device		bpf
+# MMC/SD
+device		at91_mci		# Atmel AT91 Multimedia Card Interface
+device		mmc			# MMC/SD bus
+device		mmcsd			# MMC/SD memory card
+
+# DataFlash
+device		at91_spi		# Atmel AT91 Serial Peripheral Interface
+device		spibus			# SPI bus
+
+# Pseudo devices.
+device		loop			# Network loopback
+device		random			# Entropy device
+device		ether			# Ethernet support
+device		md			# Memory "disks"
+
+# 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)
+
+# Serial (COM) ports
+device		uart			# Multi-uart driver
+
 # USB support
 options 	USB_DEBUG		# enable debug msgs
-device		ohci			# OHCI localbus->USB interface
+device		ohci			# OHCI USB interface
 device		usb			# USB Bus (required)
 #device		udbp			# USB Double Bulk Pipe devices
 device		uhid			# "Human Interface Devices"
@@ -132,11 +155,7 @@ device		rum			# Ralink Technology RT2501USB wireless NICs
 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 ATA/SCSI)
-device		da			# Direct Access (disks)
-device		cd			# CD
-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 2eed9d5..f107235 100644
--- a/sys/arm/conf/HL201
+++ b/sys/arm/conf/HL201
@@ -27,8 +27,6 @@ include 	"../at91/std.hl201"
 makeoptions	MODULES_OVERRIDE=""
 
 makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
-options 	DDB
-options 	KDB
 
 options 	SCHED_4BSD		# 4BSD scheduler
 options 	INET			# InterNETworking
@@ -40,62 +38,86 @@ options 	FFS			# Berkeley Fast Filesystem
 #options 	MD_ROOT			# MD is a potential root device
 #options 	MD_ROOT_SIZE=4096	# 4MB ram disk
 options 	NANDFS			# NAND file system
-options 	ROOTDEVNAME=\"ufs:/dev/mmcsd0s1a\"
 options 	NFSCL			# Network Filesystem Client
 #options 	NFSD			# Network Filesystem Server
 #options 	NFSLOCKD		# Network Lock Manager
 options 	NFS_ROOT		# NFS usable as /, requires NFSCL
-#options 	BOOTP_NFSROOT
-#options 	BOOTP
-#options 	BOOTP_NFSV3
-#options 	BOOTP_WIRED_TO=ate0
-#options 	BOOTP_COMPAT
-
-options 	ALT_BREAK_TO_DEBUGGER
-
-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 	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 	MUTEX_NOINLINE
-options 	RWLOCK_NOINLINE
-options 	NO_FFS_SNAPSHOT
-options 	NO_SWAPPING
-device		random
-device		loop
-device		ether
-device		uart
-device		ate
-device		at91_wdt
-device		mii
-device		lxtphy
-
-# I2C
-device		at91_twi	# Atmel AT91 Two-wire Interface
-device		iic		# I2C generic I/O device driver
-device		iicbus		# I2C bus system
+options 	_KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions
 
 # Debugging for use in -current
+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 	DIAGNOSTIC
 
-device		md
-device		bpf
+# NFS root from boopt/dhcp
+#options 	BOOTP
+#options 	BOOTP_NFSROOT
+#options 	BOOTP_COMPAT
+#options 	BOOTP_NFSV3
+#options 	BOOTP_WIRED_TO=ate0
+
+options 	ROOTDEVNAME=\"ufs:/dev/mmcsd0s1a\"
+
+# kernel/memory size reduction
+options 	MUTEX_NOINLINE
+options 	NO_FFS_SNAPSHOT
+options 	NO_SWAPPING
+options 	RWLOCK_NOINLINE
+
+# The `bpf' device enables the Berkeley Packet Filter.
+# Be aware of the administrative consequences of enabling this!
+# Note that 'bpf' is required for DHCP.
+device		bpf			# Berkeley packet filter
+
+# Ethernet
+device		mii			# Minimal MII support
+device		ate			# Atmel AT91 Ethernet driver
+device		lxtphy
+
+# I2C
+device		at91_twi		# Atmel AT91 Two-wire Interface
+device		iic			# I2C generic I/O device driver
+device		iicbus			# I2C bus system
+
+# DataFlash
+device		at91_spi		# Atmel AT91 Serial Peripheral Interface
+device		spibus			# SPI bus
+device		at45d			# Atmel AT45D
+
+# Pseudo devices.
+device		loop			# Network loopback
+device		random			# Entropy device
+device		ether			# Ethernet support
+device		md			# Memory "disks"
+
+# 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)
+
+# Serial (COM) ports
+device		uart			# Multi-uart driver
+options 	ALT_BREAK_TO_DEBUGGER
 
 # USB support
-device		ohci			# OHCI localbus->USB interface
+device		ohci			# OHCI USB interface
 device		usb			# USB Bus (required)
 #device		udbp			# USB Double Bulk Pipe devices
 device		uhid			# "Human Interface Devices"
@@ -116,11 +138,7 @@ device		miibus
 #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 ATA/SCSI)
-device		da			# Direct Access (disks)
-device		cd			# CD
-device		pass			# Passthrough device (direct ATA/SCSI access)
+
 # Wireless NIC cards
 #device		wlan			# 802.11 support
 #device		wlan_wep		# 802.11 WEP support
@@ -129,15 +147,12 @@ device		pass			# Passthrough device (direct ATA/SCSI access)
 #device		wlan_amrr		# AMRR transmit rate control algorithm
 options 	ROOTDEVNAME=\"ufs:da0s1a\"
 
+# watchdog
+device		at91_wdt		# Atmel AT91 Watchdog Timer
+
 # NAND Flash - my board as 128MB Samsung part, YMMV.
 device		nand			# NAND interface on CS3
 
-# SPI: Data Flash
-device		at91_spi		# SPI:
-device		spibus
-device		at45d			# at45db642 and maybe others
-
-
 # Coming soon, but not yet
 options 	FDT
 options 	FDT_DTB_STATIC
diff --git a/sys/arm/conf/KB920X b/sys/arm/conf/KB920X
index 79be31a..07aa62c 100644
--- a/sys/arm/conf/KB920X
+++ b/sys/arm/conf/KB920X
@@ -30,8 +30,6 @@ hints		"KB920X.hints"
 makeoptions	MODULES_OVERRIDE=""
 
 makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
-options 	DDB
-options 	KDB
 
 options 	SCHED_4BSD		# 4BSD scheduler
 options 	INET			# InterNETworking
@@ -42,67 +40,98 @@ options 	FFS			# Berkeley Fast Filesystem
 #options 	UFS_DIRHASH		# Improve performance on big directories
 #options 	MD_ROOT			# MD is a potential root device
 #options 	MD_ROOT_SIZE=4096	# 4MB ram disk
-options 	ROOTDEVNAME=\"ufs:/dev/mmcsd0s1a\"
 options 	NFSCL			# Network Filesystem Client
 #options 	NFSD			# Network Filesystem Server
 #options 	NFSLOCKD		# Network Lock Manager
 #options 	NFS_ROOT		# NFS usable as /, requires NFSCL
-#options 	BOOTP_NFSROOT
-#options 	BOOTP
-
-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 	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 	NO_SYSCTL_DESCR
-# Disable the inlining of mutex, rwlock and sx locks.  These eat up a lot
-# of space.
-options 	MUTEX_NOINLINE
-options 	RWLOCK_NOINLINE
-options 	SX_NOINLINE
-options 	NO_FFS_SNAPSHOT
-options 	NO_SWAPPING
-device		random
-device		loop
-device		ether
-device		uart
-device		ate
-device		mii
-device		lxtphy
+options 	_KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions
 
 # Debugging for use in -current
+options 	KDB			# Enable kernel debugger support
+options 	DDB			# Enable the kernel debugger
 #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 	WITNESS_SKIPSPIN	# Don't run witness on spinlocks for speed
 
-device		md
-device		at91_twi		# TWI: Two Wire Interface
-device		at91_spi		# SPI:
-device		spibus
-# MMC/SD
-device		at91_mci
-device		mmc
-device		mmcsd
-# iic
-device		iic
-device		iicbus
+# NFS root from boopt/dhcp
+#options 	BOOTP
+#options 	BOOTP_NFSROOT
+
+# alternatively, boot from a MMC/SD memory card
+options 	ROOTDEVNAME=\"ufs:/dev/mmcsd0s1a\"
+
+# kernel/memory size reduction
+options 	MUTEX_NOINLINE
+options 	SX_NOINLINE
+options 	NO_FFS_SNAPSHOT
+options 	NO_SWAPPING
+#options 	NO_SYSCTL_DESCR
+options 	RWLOCK_NOINLINE
+
+# The `bpf' device enables the Berkeley Packet Filter.
+# Be aware of the administrative consequences of enabling this!
+# Note that 'bpf' is required for DHCP.
+device		bpf			# Berkeley packet filter
+
+# Ethernet
+device		mii			# Minimal MII support
+device		ate			# Atmel AT91 Ethernet driver
+device		lxtphy
+
+# I2C
+device		at91_twi		# Atmel AT91 Two-wire Interface
+device		iic			# I2C generic I/O device driver
+device		iicbus			# I2C bus system
 device		icee
 
-device		bpf
+# MMC/SD
+device		at91_mci		# Atmel AT91 Multimedia Card Interface
+device		mmc			# MMC/SD bus
+device		mmcsd			# MMC/SD memory card
+
+# DataFlash
+device		at91_spi		# Atmel AT91 Serial Peripheral Interface
+device		spibus			# SPI bus
+
+# Pseudo devices.
+device		loop			# Network loopback
+device		random			# Entropy device
+device		ether			# Ethernet support
+device		md			# Memory "disks"
+
+# 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)
+
+# Serial (COM) ports
+device		uart			# Multi-uart driver
+
+# 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
+
 # USB support
 options 	USB_DEBUG		# enable debug msgs
-device		ohci			# OHCI localbus->USB interface
+device		ohci			# OHCI USB interface
 device		usb			# USB Bus (required)
 #device		udbp			# USB Double Bulk Pipe devices
 device		uhid			# "Human Interface Devices"
@@ -132,17 +161,6 @@ device		rum			# Ralink Technology RT2501USB wireless NICs
 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 ATA/SCSI)
-device		da			# Direct Access (disks)
-device		cd			# CD
-device		pass			# Passthrough device (direct ATA/SCSI access)
-# 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
 
 # USB device (gadget) support
 device		at91_dci		# Atmel's usb device
diff --git a/sys/arm/conf/QILA9G20 b/sys/arm/conf/QILA9G20
index 1d6bff9..5117566 100644
--- a/sys/arm/conf/QILA9G20
+++ b/sys/arm/conf/QILA9G20
@@ -30,8 +30,6 @@ hints		"QILA9G20.hints"
 makeoptions	MODULES_OVERRIDE=""
 
 makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
-options 	DDB
-options 	KDB
 
 options 	SCHED_4BSD		# 4BSD scheduler
 options 	INET			# InterNETworking
@@ -46,76 +44,81 @@ options 	NFSCL			# Network Filesystem Client
 #options 	NFSD			# Network Filesystem Server
 #options 	NFSLOCKD		# Network Lock Manager
 #options 	NFS_ROOT		# NFS usable as /, requires NFSCL
-#options 	BOOTP_NFSROOT
-#options 	BOOTP
-#options 	BOOTP_NFSV3
-#options 	BOOTP_WIRED_TO=ate0
-#options 	BOOTP_COMPAT
-
-options 	ROOTDEVNAME=\"ufs:/dev/mmcsd0s1a\"
-
-options 	ALT_BREAK_TO_DEBUGGER
-
-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 	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 	MUTEX_NOINLINE
-options 	RWLOCK_NOINLINE
-options 	NO_FFS_SNAPSHOT
-options 	NO_SWAPPING
+options 	_KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions
 
 # Debugging for use in -current
+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 	DIAGNOSTIC
 
-device		random
-device		loop
-device		bpf
-device		ether
-device		md
+# NFS root from boopt/dhcp
+#options 	BOOTP
+#options 	BOOTP_NFSROOT
+#options 	BOOTP_COMPAT
+#options 	BOOTP_NFSV3
+#options 	BOOTP_WIRED_TO=ate0
 
-device		uart			# Serial Ports
+# alternatively, boot from a MMC/SD memory card
+options 	ROOTDEVNAME=\"ufs:/dev/mmcsd0s1a\"
 
-# Ethernet
-device		ate			# Ethernet Driver	
-device		mii
-option 		AT91_ATE_USE_RMII
+# kernel/memory size reduction
+options 	MUTEX_NOINLINE
+options 	NO_FFS_SNAPSHOT
+options 	NO_SWAPPING
+options 	RWLOCK_NOINLINE
+
+# The `bpf' device enables the Berkeley Packet Filter.
+# Be aware of the administrative consequences of enabling this!
+# Note that 'bpf' is required for DHCP.
+device		bpf			# Berkeley packet filter
 
-device		at91_twi		# TWI: Two Wire Interface (EEPROM)
-device		at91_wdt		# WDT: Watchdog timer
+# Ethernet
+device		mii			# Minimal MII support
+device		ate			# Atmel AT91 Ethernet driver
+options 	AT91_ATE_USE_RMII
+
+# I2C
+device		at91_twi		# Atmel AT91 Two-wire Interface
+device		iic			# I2C generic I/O device driver
+device		iicbus			# I2C bus system
+device		icee
 
 # NOTE: SPI DataFlash and mci/mmc/mmcsd have hardware
 # 	confilict on this card. Use one or the other.
 #       see board_sam9g20ek.c
 
-# SPI: Data Flash
-#device		at91_spi		# SPI:
-#device		spibus
-#device		at45d			# at45db642 and maybe others
-
 # MMC/SD
-device		at91_mci
-device		mmc
-device		mmcsd
-option		AT91_MCI_HAS_4WIRE
-
-# iic
-device		iic
-device		iicbus
-device		icee
+device		at91_mci		# Atmel AT91 Multimedia Card Interface
+options 	AT91_MCI_HAS_4WIRE
+device		mmc			# MMC/SD bus
+device		mmcsd			# MMC/SD memory card
+
+# DataFlash
+#device		at91_spi		# Atmel AT91 Serial Peripheral Interface
+#device		spibus			# SPI bus
+#device		at45d			# Atmel AT45D
+
+# Pseudo devices.
+device		loop			# Network loopback
+device		random			# Entropy device
+device		ether			# Ethernet support
+device		md			# Memory "disks"
 
 # SCSI peripherals
 device		scbus			# SCSI bus (required for ATA/SCSI)
@@ -123,8 +126,12 @@ device		da			# Direct Access (disks)
 device		cd			# CD
 device		pass			# Passthrough device (direct ATA/SCSI access)
 
+# Serial (COM) ports
+device		uart			# Multi-uart driver
+options 	ALT_BREAK_TO_DEBUGGER
+
 # USB support
-device		ohci			# OHCI localbus->USB interface
+device		ohci			# OHCI USB interface
 device		usb			# USB Bus (required)
 device		umass			# Disks/Mass storage - Requires scbus and da
 device		uhid			# "Human Interface Devices"
@@ -154,3 +161,5 @@ device		udav			# Davicom DM9601E USB
 #device		wlan_tkip		# 802.11 TKIP support
 #device		wlan_amrr		# AMRR transmit rate control algorithm
 
+# watchdog
+device		at91_wdt		# Atmel AT91 Watchdog Timer
diff --git a/sys/arm/conf/SAM9G20EK b/sys/arm/conf/SAM9G20EK
index e12a143..e22c74e 100644
--- a/sys/arm/conf/SAM9G20EK
+++ b/sys/arm/conf/SAM9G20EK
@@ -89,7 +89,7 @@ device		bpf			# Berkeley packet filter
 # Ethernet
 device		mii			# Minimal MII support
 device		ate			# Atmel AT91 Ethernet driver
-option 		AT91_ATE_USE_RMII
+options 	AT91_ATE_USE_RMII
 
 # I2C
 device		at91_twi		# Atmel AT91 Two-wire Interface
diff --git a/sys/arm/conf/SAM9X25EK b/sys/arm/conf/SAM9X25EK
index 08dc1f5..ff2e97c 100644
--- a/sys/arm/conf/SAM9X25EK
+++ b/sys/arm/conf/SAM9X25EK
@@ -35,9 +35,6 @@ options 	KDB
 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 	SOFTUPDATES		# Enable FFS soft updates support
 #options 	UFS_ACL			# Support for access control lists
@@ -48,30 +45,20 @@ options 	NFSCL			# Network Filesystem Client
 #options 	NFSD			# Network Filesystem Server
 #options 	NFSLOCKD		# Network Lock Manager
 #options 	NFS_ROOT		# NFS usable as /, requires NFSCL
-#options 	BOOTP_NFSROOT
-#options 	BOOTP
-#options 	BOOTP_NFSV3
-#options 	BOOTP_WIRED_TO=ate0
-#options 	BOOTP_COMPAT
-
-options 	ROOTDEVNAME=\"ufs:/dev/mmcsd0s1a\"
-
-options 	ALT_BREAK_TO_DEBUGGER
-
+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 	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 	MUTEX_NOINLINE
-options 	RWLOCK_NOINLINE
-options 	NO_FFS_SNAPSHOT
-options 	NO_SWAPPING
+options 	_KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions
+
 
 # Debugging for use in -current
 #options 	INVARIANTS		# Enable calls of extra sanity checking
@@ -80,43 +67,60 @@ options 	NO_SWAPPING
 #options 	WITNESS_SKIPSPIN	# Don't run witness on spinlocks for speed
 #options 	DIAGNOSTIC
 
-device		random
-device		pty
-device		loop
-device		bpf
-device		ether
-device		md
+# NFS root from boopt/dhcp
+#options 	BOOTP
+#options 	BOOTP_NFSROOT
+#options 	BOOTP_COMPAT
+#options 	BOOTP_NFSV3
+#options 	BOOTP_WIRED_TO=ate0
+
+# alternatively, boot from a MMC/SD memory card
+options 	ROOTDEVNAME=\"ufs:/dev/mmcsd0s1a\"
+
+# kernel/memory size reduction
+options 	MUTEX_NOINLINE
+options 	NO_FFS_SNAPSHOT
+options 	NO_SWAPPING
+options 	RWLOCK_NOINLINE
 
-device		uart			# Serial Ports
+# The `bpf' device enables the Berkeley Packet Filter.
+# Be aware of the administrative consequences of enabling this!
+# Note that 'bpf' is required for DHCP.
+device		bpf			# Berkeley packet filter
 
 # Ethernet
-device		ate			# Ethernet Driver	
-device		mii
-option 		AT91_ATE_USE_RMII
+device		mii			# Minimal MII support
+device		ate			# Atmel AT91 Ethernet driver
+options 	AT91_ATE_USE_RMII
 
-#device		at91_twi		# TWI: Two Wire Interface (EEPROM)
-device		at91_wdt		# WDT: Watchdog timer
+# I2C
+#device		at91_twi		# Atmel AT91 Two-wire Interface
+device		iic
+device		iicbus
+device		icee
 
 # NOTE: SPI DataFlash and mci/mmc/mmcsd have hardware 
 # 	confilict on this card. Use one or the other.
 #       see board_sam9g20ek.c
 
-# SPI: Data Flash 
-#device		at91_spi		# SPI:
-#device		spibus
-#device		at45d			# at45db642 and maybe others
-
 # MMC/SD
-device		at91_mci
-device		mmc
-device		mmcsd
-#option		AT91_MCI_SLOT_B
-option		AT91_MCI_HAS_4WIRE
-
-# iic
-device		iic
-device		iicbus
-device		icee
+device		at91_mci		# Atmel AT91 Multimedia Card Interface
+options 	AT91_MCI_HAS_4WIRE
+#options 	AT91_MCI_SLOT_B
+device		mmc			# MMC/SD bus
+device		mmcsd			# MMC/SD memory card
+
+# DataFlash
+#device		at91_spi		# Atmel AT91 Serial Peripheral Interface
+#device		spibus			# SPI bus
+#device		at45d			# Atmel AT45D
+
+# Pseudo devices.
+device		loop			# Network loopback
+device		random			# Entropy device
+device		ether			# Ethernet support
+device		md			# Memory "disks"
+device		pty
 
 # SCSI peripherals
 device		scbus			# SCSI bus (required for ATA/SCSI)
@@ -124,8 +128,12 @@ device		da			# Direct Access (disks)
 device		cd			# CD
 device		pass			# Passthrough device (direct ATA/SCSI access)
 
+# Serial (COM) ports
+device		uart			# Multi-uart driver
+options 	ALT_BREAK_TO_DEBUGGER
+
 # USB support
-#device		ohci			# OHCI localbus->USB interface
+#device		ohci			# OHCI USB interface
 #device		usb			# USB Bus (required)
 #device		umass			# Disks/Mass storage - Requires scbus and da
 #device		uhid			# "Human Interface Devices"
@@ -155,3 +163,5 @@ device		miibus
 #device		wlan_tkip		# 802.11 TKIP support
 #device		wlan_amrr		# AMRR transmit rate control algorithm
 
+# watchdog
+device		at91_wdt		# Atmel AT91 Watchdog Timer
diff --git a/sys/arm/conf/SN9G45 b/sys/arm/conf/SN9G45
index e85d613..28d2c25 100644
--- a/sys/arm/conf/SN9G45
+++ b/sys/arm/conf/SN9G45
@@ -29,8 +29,6 @@ include 	"../at91/std.sn9g45"
 makeoptions	MODULES_OVERRIDE=""
 
 makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
-options 	DDB
-options 	KDB
 
 options 	SCHED_4BSD		# 4BSD scheduler
 options 	INET			# InterNETworking
@@ -45,55 +43,60 @@ options 	NFSCL			# Network Filesystem Client
 #options 	NFSD			# Network Filesystem Server
 #options 	NFSLOCKD		# Network Lock Manager
 #options 	NFS_ROOT		# NFS usable as /, requires NFSCL
-#options 	BOOTP_NFSROOT
-#options 	BOOTP
-#options 	BOOTP_NFSV3
-#options 	BOOTP_WIRED_TO=ate0
-#options 	BOOTP_COMPAT
-
-options 	ROOTDEVNAME=\"ufs:/dev/da0s1\"
-
-options 	ALT_BREAK_TO_DEBUGGER
-
-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 	PSEUDOFS		# Pseudo-filesystem framework
+options 	GEOM_PART_BSD		# BSD partition scheme
+options 	GEOM_PART_MBR		# MBR partition scheme
 options 	SCSI_DELAY=1000		# 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 	MUTEX_NOINLINE
-options 	RWLOCK_NOINLINE
-options 	NO_FFS_SNAPSHOT
-options 	NO_SWAPPING
+options 	_KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions
 
 # Debugging for use in -current
+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 	DIAGNOSTIC
 
-device		random
-device		loop
-device		bpf
-device		ether
-device		md
+# NFS root from boopt/dhcp
+#options 	BOOTP
+#options 	BOOTP_NFSROOT
+#options 	BOOTP_COMPAT
+#options 	BOOTP_NFSV3
+#options 	BOOTP_WIRED_TO=ate0
+
+# alternatively, boot from a MMC/SD memory card
+options 	ROOTDEVNAME=\"ufs:/dev/da0s1\"
+
+# kernel/memory size reduction
+options 	MUTEX_NOINLINE
+options 	NO_FFS_SNAPSHOT
+options 	NO_SWAPPING
+options 	RWLOCK_NOINLINE
 
-device		uart			# Serial Ports
+# The `bpf' device enables the Berkeley Packet Filter.
+# Be aware of the administrative consequences of enabling this!
+# Note that 'bpf' is required for DHCP.
+device		bpf			# Berkeley packet filter
 
 # Ethernet
-device		ate			# Ethernet Driver	
-device		mii
-option 		AT91_ATE_USE_RMII
+device		mii			# Minimal MII support
+device		ate			# Atmel AT91 Ethernet driver
+options 	AT91_ATE_USE_RMII
 
-device		at91_wdt		# WDT: Watchdog timer
+# Pseudo devices.
+device		loop			# Network loopback
+device		random			# Entropy device
+device		ether			# Ethernet support
+device		md			# Memory "disks"
 
 # SCSI peripherals
 device		scbus			# SCSI bus (required for ATA/SCSI)
@@ -101,8 +104,12 @@ device		da			# Direct Access (disks)
 device		cd			# CD
 device		pass			# Passthrough device (direct ATA/SCSI access)
 
+# Serial (COM) ports
+device		uart			# Multi-uart driver
+options 	ALT_BREAK_TO_DEBUGGER
+
 # USB support
-device		ohci			# OHCI localbus->USB interface
+device		ohci			# OHCI USB interface
 device		usb			# USB Bus (required)
 device		umass			# Disks/Mass storage - Requires scbus and da
 device		uhid			# "Human Interface Devices"
@@ -132,3 +139,5 @@ device		udav			# Davicom DM9601E USB
 #device		wlan_tkip		# 802.11 TKIP support
 #device		wlan_amrr		# AMRR transmit rate control algorithm
 
+# watchdog
+device		at91_wdt		# Atmel AT91 Watchdog Timer