PERFORCE change 149386 for review

[Warner Losh]

http://perforce.freebsd.org/chv.cgi?CH=149386

Change 149386 by imp at imp_lighthouse on 2008/09/07 19:09:48

	Update based on changes to KB920X

Affected files ...

.. //depot/projects/arm/src/sys/arm/conf/TSC4370#21 edit

Differences ...

==== //depot/projects/arm/src/sys/arm/conf/TSC4370#21 (text+ko) ====

@@ -1,5 +1,4 @@
-# KB920X -- Custom kernel configuration for the KB9200, 9201 and 9202
-# AT91RM9200 evaluation boards from kwikbyte.com.
+# TSC4370 -- Custom kernel for an embedded timing board
 #
 # For more information on this file, please read the handbook section on
 # Kernel Configuration Files:
@@ -17,20 +16,21 @@
 # in NOTES.
 #
 # From:
-# $FreeBSD: src/sys/arm/conf/KB920X,v 1.7 2006/06/17 23:34:59 imp Exp $
+# FreeBSD: head/sys/arm/conf/KB920X 182852 2008-09-07 18:55:55Z imp
 
 machine		arm
 ident		TSC4370
 
-options		AT91_TSC
+options 	AT91_TSC
 include		"../at91/std.kb920x"
-#To statically compile in device wiring instead of /boot/device.hints
+# The AT91 platform doesn't use /boot/loader, so we have to statically wire
+# hints.
 hints		"hints.at91rm9200"
 hints		"TSC4370.hints"
 
 #makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
-options		DDB
-options		KDB
+options 	DDB
+options 	KDB
 options 	BREAK_TO_DEBUGGER
 options 	ALT_BREAK_TO_DEBUGGER
 
@@ -42,11 +42,12 @@
 #options 	UFS_ACL			#Support for access control lists
 #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 	MD_ROOT_SIZE=4096	# 4MB ram disk
 #options 	ROOTDEVNAME=\"ufs:md0\"
 options 	ROOTDEVNAME=\"ufs:/dev/mmcsd0s1a\"
-#options 	NFSCLIENT		#Network Filesystem Client
+options 	NFSCLIENT		#Network Filesystem Client
 #options 	NFSSERVER		#Network Filesystem Server
+#options 	NFSLOCKD		#Network Lock Manager
 #options 	NFS_ROOT		#NFS usable as /, requires NFSCLIENT
 #options 	BOOTP_NFSROOT
 #options 	BOOTP
@@ -60,31 +61,24 @@
 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 	NO_SYSCTL_DESCR
+#options 	SYSCTL_OMIT_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		genclock
+device		random
+device		pty
 device		loop
-device		random
 device		ether
-device		pty
 device		nexus
 device		uart
 device		ate
 device		mii
 device		lxtphy
 
-# USB support
-##device		ohci		# OHCI PCI->USB interface
-##device		usb		# USB Bus (required)
-##options		USB_DEBUG
-##device		umass		# Disks/Mass storage - Requires scbus and da
-##device		scbus		# SCSI bus (required for SCSI)
-##device		da		# Direct Access (disks)
-
 # Debugging for use in -current
 #options 	INVARIANTS		#Enable calls of extra sanity checking
 #options 	INVARIANT_SUPPORT	#Extra sanity checks of internal structures, required by INVARIANTS
@@ -93,27 +87,22 @@
 
 device		mem			# Memory and kernel memory devices
 device		md
-#device		at91_twi		# TWI: Two Wire Interface
-device		at91_bbiic		# TWI: Two Wire Interface, bit bang
+device		at91_twi		# TWI: Two Wire Interface
 device		at91_spi		# SPI bridge support
 device		at91_ssc
 device		at91_tc
-# MMC
+# MMC/SD
 device		at91_mci
-device		mmc			# mmc/sd bus
-device		mmcsd			# mmc/sd flash cards
+device		mmc
+device		mmcsd
 # iic
 device		iic
 device		iicbus
 device		icee
-device		iicbb
 # SPI bus
 device		spibus
 device  	at45d		# at45db642 and maybe others
 
-# 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
 
 # Enable support for the kernel PLL to use an external PPS signal,