svn commit: r261127 - head/sys/arm/conf

[Warner Losh]

Author: imp
Date: Fri Jan 24 16:56:27 2014
New Revision: 261127
URL: http://svnweb.freebsd.org/changeset/base/261127

Log:
  Add NAND support
  Fix comment
  This board has 4 wire support

Modified:
  head/sys/arm/conf/SAM9G20EK

Modified: head/sys/arm/conf/SAM9G20EK
==============================================================================
--- head/sys/arm/conf/SAM9G20EK	Fri Jan 24 16:50:15 2014	(r261126)
+++ head/sys/arm/conf/SAM9G20EK	Fri Jan 24 16:56:27 2014	(r261127)
@@ -37,7 +37,8 @@ options 	FFS			#Berkeley Fast Filesystem
 #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	# 3MB ram disk
+#options 	MD_ROOT_SIZE=4096	# 4MB ram disk
+options 	NANDFS			#NAND file system
 options 	NFSCL			#New Network Filesystem Client
 #options 	NFSD			#New Network Filesystem Server
 #options 	NFSLOCKD		#Network Lock Manager
@@ -91,6 +92,9 @@ option 		AT91_ATE_USE_RMII
 device		at91_twi		# TWI: Two Wire Interface (EEPROM)
 device		at91_wdt		# WDT: Watchdog timer
 
+# NAND Flash - Reference design has Samsung 256MB but others possible
+device		nand			# NAND interface on CS3
+
 # NOTE: SPI DataFlash and mci/mmc/mmcsd have hardware
 # 	confilict on this card. Use one or the other.
 #       see board_sam9g20ek.c
@@ -105,7 +109,7 @@ device		at91_mci
 device		mmc
 device		mmcsd
 option		AT91_MCI_SLOT_B
-#option		AT91_MCI_HAS_4WIRE
+option		AT91_MCI_HAS_4WIRE
 
 # iic
 device		iic
@@ -128,14 +132,14 @@ device		uhid		# "Human Interface Devices
 #device		udbp		# USB Double Bulk Pipe devices
 
 # USB Ethernet, requires miibus
-device		miibus
+#device		miibus
 #device		aue		# ADMtek USB Ethernet
 #device		axe		# ASIX Electronics USB Ethernet
 #device		cdce		# Generic USB over Ethernet
 #device		cue		# CATC USB Ethernet
 #device		kue		# Kawasaki LSI USB Ethernet
 #device		rue		# RealTek RTL8150 USB Ethernet
-device		udav		# Davicom DM9601E USB
+#device		udav		# Davicom DM9601E USB
 
 # USB Wireless
 #device		rum		# Ralink Technology RT2501USB wireless NICs
@@ -149,4 +153,3 @@ device		udav		# Davicom DM9601E USB
 #device		wlan_ccmp	# 802.11 CCMP support
 #device		wlan_tkip	# 802.11 TKIP support
 #device		wlan_amrr	# AMRR transmit rate control algorithm
-