X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fcpu%2Farm%2Fhw%2Fcrtat91sam7_rom.S;h=51635fde4cb36b16a6ff32297bfea069d8989182;hb=57fa5e371a8b40afc99b922731b77d17c55330a4;hp=9bd9d46c48941d56660442a1fad22e3d451e1000;hpb=32d1445272120a254d77ce8d1af1f527da7a2c17;p=bertos.git diff --git a/bertos/cpu/arm/hw/crtat91sam7_rom.S b/bertos/cpu/arm/hw/crtat91sam7_rom.S index 9bd9d46c..51635fde 100644 --- a/bertos/cpu/arm/hw/crtat91sam7_rom.S +++ b/bertos/cpu/arm/hw/crtat91sam7_rom.S @@ -30,7 +30,6 @@ * * --> * - * \version $Id: $ * * \author Francesco Sacchi * @@ -74,18 +73,18 @@ #include "cfg/cfg_arch.h" -#if CPU_FREQ != 48023000L +#if CPU_FREQ != 48054857L /* Avoid errors on nightly test */ #if !defined(ARCH_NIGHTTEST) || !(ARCH & ARCH_NIGHTTEST) - #warning Clock registers set for 48.023MHz operation, revise following code if you want a different clock. + #warning Clock registers set for 48.055MHz operation, revise following code if you want a different clock. #endif #endif #if CPU_ARM_SAM7S_LARGE || CPU_ARM_SAM7X /* - * With a 18.420MHz cristal, master clock is: - * (((18.420 * PLL_MUL_VAL + 1) / PLL_DIV_VAL) / AT91MCK_PRES) = 48.023MHz + * With a 18.432MHz cristal, master clock is: + * (((18.432 * (PLL_MUL_VAL + 1)) / PLL_DIV_VAL) / AT91MCK_PRES) = 48.055MHz */ #define PLL_MUL_VAL 72 /**< Real multiplier value is PLL_MUL_VAL + 1! */ #define PLL_DIV_VAL 14