PERFORCE change 110302 for review

[Warner Losh]

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

Change 110302 by imp at imp_paco-paco on 2006/11/20 14:56:04

	Merge from head

Affected files ...

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

Differences ...

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

@@ -1,4 +1,5 @@
-# GENERIC -- Generic kernel configuration file for FreeBSD/arm
+# AVILA -- Gateworks Avila XScale board
+# kernel configuration file for FreeBSD/arm
 #
 # For more information on this file, please read the handbook section on
 # Kernel Configuration Files:
@@ -15,7 +16,7 @@
 # If you are in doubt as to the purpose or necessity of a line, check first 
 # in NOTES.
 #
-# $FreeBSD: src/sys/arm/conf/IQ31244,v 1.15 2006/06/15 19:58:52 netchild Exp $
+# $FreeBSD: src/sys/arm/conf/AVILA,v 1.1 2006/11/19 23:58:12 sam Exp $
 
 machine		arm
 ident		AVILA
@@ -35,9 +36,15 @@
 options		HZ=100
 options		DEVICE_POLLING
 
-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
+# Debugging for use in -current
+options		KDB
+#options		GDB
+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
 
 options 	SCHED_4BSD		#4BSD scheduler
 options		KSE
@@ -85,12 +92,12 @@
 
 device		ixpiic
 device		ixpwdog		# watchdog timer
-device		rtc_avila	# DS1762 on I2C bus
-device		adc_avila	# AD7418 on I2C bus
+device		ds1672		# DS1672 on I2C bus
+device		ad7418		# AD7418 on I2C bus
 
 device		ata
-device		ata_avila	# Gateworks CF/IDE support
 device		atadisk         # ATA disk drives
+device		avila_ata	# Gateworks CF/IDE support
 
 device		npe		# Network Processing Engine
 device		npe_fw		# NPE firmware
@@ -104,16 +111,6 @@
 device		loop
 device		if_bridge
 
-# Debugging for use in -current
-options		KDB
-#options		GDB
-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
-
 # To make an SMP kernel, the next two are needed
 #options 	SMP			# Symmetric MultiProcessor Kernel
 #options 	APIC_IO			# Symmetric (APIC) I/O
@@ -122,7 +119,6 @@
 device          random          # Entropy device
 
 #options		ARM_USE_SMALL_ALLOC
-# Floppy drives
 
 # Wireless NIC cards
 device		wlan		# 802.11 support