From owner-svn-src-all@FreeBSD.ORG  Fri Apr 13 18:01:53 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id E3D3F1065670;
	Fri, 13 Apr 2012 18:01:53 +0000 (UTC)
	(envelope-from adrian@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id CFA078FC1D;
	Fri, 13 Apr 2012 18:01:53 +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 q3DI1rfN091375;
	Fri, 13 Apr 2012 18:01:53 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q3DI1rEV091372;
	Fri, 13 Apr 2012 18:01:53 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201204131801.q3DI1rEV091372@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Fri, 13 Apr 2012 18:01:53 +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: r234232 - head/sys/mips/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: Fri, 13 Apr 2012 18:01:54 -0000

Author: adrian
Date: Fri Apr 13 18:01:53 2012
New Revision: 234232
URL: http://svn.freebsd.org/changeset/base/234232

Log:
  * Enable ATH_EEPROM_FIRMWARE, now that it's a compile time option
  * Tidy up things a bit.

Modified:
  head/sys/mips/conf/AP94
  head/sys/mips/conf/AP96

Modified: head/sys/mips/conf/AP94
==============================================================================
--- head/sys/mips/conf/AP94	Fri Apr 13 18:00:48 2012	(r234231)
+++ head/sys/mips/conf/AP94	Fri Apr 13 18:01:53 2012	(r234232)
@@ -30,5 +30,6 @@ options		AR71XX_ENV_UBOOT
 # options		MD_ROOT
 # options		MD_ROOT_SIZE="6144"
 
-options		AR71XX_ATH_EEPROM
-device		firmware
+options		AR71XX_ATH_EEPROM	# Fetch EEPROM/PCI config from flash
+options		ATH_EEPROM_FIRMWARE	# Use EEPROM from flash
+device		firmware		# Used by the above

Modified: head/sys/mips/conf/AP96
==============================================================================
--- head/sys/mips/conf/AP96	Fri Apr 13 18:00:48 2012	(r234231)
+++ head/sys/mips/conf/AP96	Fri Apr 13 18:01:53 2012	(r234232)
@@ -30,5 +30,6 @@ options		AR71XX_ENV_UBOOT
 # options		MD_ROOT
 # options		MD_ROOT_SIZE="6144"
 
-options		AR71XX_ATH_EEPROM
-device		firmware
+options 	AR71XX_ATH_EEPROM	# Fetch EEPROM/PCI config from flash
+options 	ATH_EEPROM_FIRMWARE	# Use EEPROM from flash
+device		firmware		# Used by the above