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

[Marius Strobl]

Author: marius
Date: Sun Jun  3 01:07:55 2012
New Revision: 236497
URL: http://svn.freebsd.org/changeset/base/236497

Log:
  - Now that the DataFlash related drivers work properly (at91_spi(4) since
    r236495 and at45d(4) since r236496), enable them by default.
  - Sort BOOTP options.

Modified:
  head/sys/arm/conf/ETHERNUT5

Modified: head/sys/arm/conf/ETHERNUT5
==============================================================================
--- head/sys/arm/conf/ETHERNUT5	Sun Jun  3 01:00:55 2012	(r236496)
+++ head/sys/arm/conf/ETHERNUT5	Sun Jun  3 01:07:55 2012	(r236497)
@@ -66,11 +66,11 @@ options 	PRINTF_BUFR_SIZE=128	# Prevent 
 #options 	INCLUDE_CONFIG_FILE	# Include this file in kernel
 
 # required for netbooting
-options 	BOOTP_NFSROOT
 options 	BOOTP
+options 	BOOTP_COMPAT
+options 	BOOTP_NFSROOT
 options 	BOOTP_NFSV3
 options 	BOOTP_WIRED_TO=ate0
-options 	BOOTP_COMPAT
 
 # alternatively, boot from a MMC/SD memory card
 #options 	ROOTDEVNAME=\"ufs:/dev/mmcsd0a\"
@@ -117,11 +117,11 @@ options 	AT91_MCI_HAS_4WIRE
 device		mmc		# MMC/SD bus
 device		mmcsd		# MMC/SD memory card
 
-# DataFlash - totally b0rken drivers
-#device		at91_spi	# Atmel AT91 Serial Peripheral Interface
-#device		spibus		# SPI bus
-#device		at45d		# Atmel AT45D
-#device		geom_map	# GEOM partition mapping
+# DataFlash
+device		at91_spi	# Atmel AT91 Serial Peripheral Interface
+device		spibus		# SPI bus
+device		at45d		# Atmel AT45D
+device		geom_map	# GEOM partition mapping
 
 # Pseudo devices.
 device		loop		# Network loopback