From 7670aa69518be468704e325180cc8a0f7898c2b8 Mon Sep 17 00:00:00 2001 From: imp Date: Mon, 4 Jun 2012 04:24:59 +0000 Subject: 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. --- sys/arm/at91/at91_pmc.c | 2 +- sys/conf/options.arm | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'sys') diff --git a/sys/arm/at91/at91_pmc.c b/sys/arm/at91/at91_pmc.c index 285d7ea..2a7ee5e 100644 --- a/sys/arm/at91/at91_pmc.c +++ b/sys/arm/at91/at91_pmc.c @@ -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); diff --git a/sys/conf/options.arm b/sys/conf/options.arm index bbe7f12..6fee07c 100644 --- a/sys/conf/options.arm +++ b/sys/conf/options.arm @@ -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 -- cgit v1.1