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
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
