upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-06-08 16:22:46 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Eliminate the now-unused AT91C_MASTER_CLOCK option and change the one

Browse source 
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.
This commit is contained in:
Warner Losh 2012-06-04 04:24:59 +00:00
parent 23c0d041ba
commit 537cdfaff1
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sys/arm/at91/at91_pmc.c
View file

@ -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);

3
sys/conf/options.arm
View file

@ -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