From owner-svn-src-all@FreeBSD.ORG  Sun Jun  3 01:07:55 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C4DF6106566B;
	Sun,  3 Jun 2012 01:07:55 +0000 (UTC)
	(envelope-from marius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id AFEF68FC16;
	Sun,  3 Jun 2012 01:07:55 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q5317tFr024840;
	Sun, 3 Jun 2012 01:07:55 GMT (envelope-from marius@svn.freebsd.org)
Received: (from marius@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q5317tCI024838;
	Sun, 3 Jun 2012 01:07:55 GMT (envelope-from marius@svn.freebsd.org)
Message-Id: <201206030107.q5317tCI024838@svn.freebsd.org>
From: Marius Strobl <marius@FreeBSD.org>
Date: Sun, 3 Jun 2012 01:07:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r236497 - head/sys/arm/conf
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 03 Jun 2012 01:07:55 -0000

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