PERFORCE change 109268 for review

[Sam Leffler]

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

Change 109268 by sam at sam_ebb on 2006/11/05 06:36:31

	merge from sam_avila

Affected files ...

.. //depot/projects/arm/src/sys/arm/conf/AVILA#3 edit

Differences ...

==== //depot/projects/arm/src/sys/arm/conf/AVILA#3 (text+ko) ====

@@ -29,7 +29,7 @@
 #To statically compile in device wiring instead of /boot/device.hints
 #hints		"GENERIC.hints"		#Default places to look for devices.
 
-#makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
+makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
 makeoptions	CONF_CFLAGS=-mcpu=xscale
 options		HZ=100
 #options		DEVICE_POLLING
@@ -59,43 +59,40 @@
 options		BOOTP_NFSROOT
 options		BOOTP_NFSV3
 options		BOOTP_WIRED_TO=npe0
+#options		BOOTP_WIRED_TO=ath0
 options		BOOTP_COMPAT
 #options		PREEMPTION
+#options		VERBOSE_SYSINIT
+
 device		genclock
-device		loop
-device		ether
 device		nexus
 device		mem			# Memory and kernel memory devices
 #device		saarm
-device		miibus
-device		rl
-device		em
+
+device		pci
 device		uart
-device		pci
+
+# I2C Bus
+device		iicbus
+device		iicbb
+device		iic
+
+device		ixpiic
 
 device		ata
 device		atadisk         # ATA disk drives
-device		ataraid         # ATA RAID drives
-device		atapicd         # ATAPI CDROM drives
-device		atapifd         # ATAPI floppy drives
-device		atapist         # ATAPI tape drives
 options		ATA_STATIC_ID   # Static device numbering
 
-# SCSI Controllers
+device		npe		# Network Processing Engine
+device		npe_fw		# NPE firmware
+device		firmware	# firmware support for npe_fw
+device		qmgr		# Q Manager
+device		miibus		# NB: required by npe
+device		ether
 
 device		pty
-#options 	AHC_REG_PRETTY_PRINT	# Print register bitfields in debug
-					# output.  Adds ~128k to driver.
-#options 	AHD_REG_PRETTY_PRINT	# Print register bitfields in debug
-					# output.  Adds ~215k to driver.
-
-# I2C Bus
-device		iicbus
-device		iicbb
-device		iic
+device		loop
 
-device         ixpiic
-
 # Debugging for use in -current
 options		KDB
 options 	DDB			#Enable the kernel debugger
@@ -109,9 +106,18 @@
 #options 	SMP			# Symmetric MultiProcessor Kernel
 #options 	APIC_IO			# Symmetric (APIC) I/O
 options		XSCALE_CACHE_READ_WRITE_ALLOCATE
-device md
+device		md
 device          random          # Entropy device
 
 #options		ARM_USE_SMALL_ALLOC
 # Floppy drives
 
+# 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		ath		# Atheros pci/cardbus NIC's
+device		ath_hal		# Atheros HAL (Hardware Access Layer)
+device		ath_rate_sample	# SampleRate tx rate control for ath
+options		ATH_DEBUG