From owner-svn-src-head@FreeBSD.ORG  Mon Jun  4 04:25:01 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B2D6B106566B;
	Mon,  4 Jun 2012 04:25:00 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 9D5EA8FC17;
	Mon,  4 Jun 2012 04:25:00 +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 q544P0xF004387;
	Mon, 4 Jun 2012 04:25:00 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q544P0f2004384;
	Mon, 4 Jun 2012 04:25:00 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <201206040425.q544P0f2004384@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Mon, 4 Jun 2012 04:25:00 +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: r236535 - in head/sys: arm/at91 conf
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 04 Jun 2012 04:25:01 -0000

Author: imp
Date: Mon Jun  4 04:24:59 2012
New Revision: 236535
URL: http://svn.freebsd.org/changeset/base/236535

Log:
  Eliminate the now-unused AT91C_MASTER_CLOCK option and change the one
  place in the source it was used to the more correct AT91C_MAIN_CLOCK.
  Sort AT91C_MAIN_CLOCK into a better location in the options.arm file.

Modified:
  head/sys/arm/at91/at91_pmc.c
  head/sys/conf/options.arm

Modified: head/sys/arm/at91/at91_pmc.c
==============================================================================
--- head/sys/arm/at91/at91_pmc.c	Mon Jun  4 03:51:08 2012	(r236534)
+++ head/sys/arm/at91/at91_pmc.c	Mon Jun  4 04:24:59 2012	(r236535)
@@ -429,7 +429,7 @@ at91_pmc_sense_main_clock(void)
 	 * measure it correctly, and that any error can be adequately
 	 * compensated for by roudning to the nearest 500Hz.  Users
 	 * with fast, or odd-ball clocks will need to set
-	 * AT91C_MASTER_CLOCK in the kernel config file.
+	 * AT91C_MAIN_CLOCK in the kernel config file.
 	 */
 	if (ckgr_val >= 21000000)
 		return ((ckgr_val + 250) / 500 * 500);

Modified: head/sys/conf/options.arm
==============================================================================
--- head/sys/conf/options.arm	Mon Jun  4 03:51:08 2012	(r236534)
+++ head/sys/conf/options.arm	Mon Jun  4 04:24:59 2012	(r236535)
@@ -4,8 +4,6 @@ ARM_CACHE_LOCK_ENABLE	opt_global.h
 ARMFPE			opt_global.h
 ARM_KERN_DIRECTMAP	opt_vm.h
 ARM_USE_SMALL_ALLOC	opt_global.h
-AT91C_MASTER_CLOCK	opt_global.h
-AT91C_MAIN_CLOCK	opt_at91.h
 COUNTS_PER_SEC		opt_timer.h
 CPU_SA1100		opt_global.h
 CPU_SA1110		opt_global.h
@@ -38,5 +36,6 @@ AT91_TSC		opt_at91.h
 AT91_KWIKBYTE		opt_at91.h
 AT91_MCI_HAS_4WIRE	opt_at91.h
 AT91_MCI_SLOT_B		opt_at91.h
+AT91C_MAIN_CLOCK	opt_at91.h
 CPU_FA526		opt_global.h
 CPU_FA626TE		opt_global.h