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

1 files changed, 66 insertions, 48 deletions

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