From owner-svn-src-all@FreeBSD.ORG  Sun Aug 26 20:22:44 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 99C9A1065670;
	Sun, 26 Aug 2012 20:22:44 +0000 (UTC) (envelope-from ray@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 84EF38FC08;
	Sun, 26 Aug 2012 20:22:44 +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 q7QKMiiF077982;
	Sun, 26 Aug 2012 20:22:44 GMT (envelope-from ray@svn.freebsd.org)
Received: (from ray@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7QKMiCI077979;
	Sun, 26 Aug 2012 20:22:44 GMT (envelope-from ray@svn.freebsd.org)
Message-Id: <201208262022.q7QKMiCI077979@svn.freebsd.org>
From: Aleksandr Rybalko <ray@FreeBSD.org>
Date: Sun, 26 Aug 2012 20:22:44 +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: r239716 - head/sys/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, 26 Aug 2012 20:22:44 -0000

Author: ray
Date: Sun Aug 26 20:22:43 2012
New Revision: 239716
URL: http://svn.freebsd.org/changeset/base/239716

Log:
  Move AR71XX (MIPS SoCs family) options to options.mips file.
  
  PR:		170859
  Submitted by:	Luiz Otavio O Souza
  Approved by:	adrian (mentor)

Modified:
  head/sys/conf/options
  head/sys/conf/options.mips

Modified: head/sys/conf/options
==============================================================================
--- head/sys/conf/options	Sun Aug 26 14:30:14 2012	(r239715)
+++ head/sys/conf/options	Sun Aug 26 20:22:43 2012	(r239716)
@@ -906,11 +906,3 @@ RACCT		opt_global.h
 
 # Resource Limits
 RCTL		opt_global.h
-
-# At least one of the AR71XX ubiquiti boards has a Redboot configuration
-# that "lies" about the amount of RAM it has. Until a cleaner method is
-# defined, this option will suffice in overriding what Redboot says.
-AR71XX_REALMEM		opt_ar71xx.h
-AR71XX_ENV_UBOOT	opt_ar71xx.h
-AR71XX_ENV_REDBOOT	opt_ar71xx.h
-AR71XX_ATH_EEPROM	opt_ar71xx.h

Modified: head/sys/conf/options.mips
==============================================================================
--- head/sys/conf/options.mips	Sun Aug 26 14:30:14 2012	(r239715)
+++ head/sys/conf/options.mips	Sun Aug 26 20:22:43 2012	(r239716)
@@ -74,6 +74,16 @@ ARGE_DEBUG			opt_arge.h
 ARGE_MDIO			opt_arge.h
 
 #
+# At least one of the AR71XX ubiquiti boards has a Redboot configuration
+# that "lies" about the amount of RAM it has. Until a cleaner method is
+# defined, this option will suffice in overriding what Redboot says.
+#
+AR71XX_REALMEM			opt_ar71xx.h
+AR71XX_ENV_UBOOT		opt_ar71xx.h
+AR71XX_ENV_REDBOOT		opt_ar71xx.h
+AR71XX_ATH_EEPROM		opt_ar71xx.h
+
+#
 # Options that control the Ralink RT305xF Etherenet MAC.
 #
 IF_RT_DEBUG			opt_if_rt.h