Change error message from error to warning.

[bertos.git] / bertos / cpu / arm / hw / crtat91sam7_rom.S

diff --git a/bertos/cpu/arm/hw/crtat91sam7_rom.S b/bertos/cpu/arm/hw/crtat91sam7_rom.S
index a889680dd6f5b280bef89bf2836090a4cb17a7e5..c5317847769262965a9e47f833792a5c78937080 100644 (file)
--- a/bertos/cpu/arm/hw/crtat91sam7_rom.S
+++ b/bertos/cpu/arm/hw/crtat91sam7_rom.S
@@ -70,16 +70,19 @@
  *
  */
 
-#include "hw_cpu.h"
 #include <cpu/detect.h>
+#include "cfg/cfg_arch.h"
 
 
-#if CLOCK_FREQ != 48023000L
-#error Clock registers set for 48MHz operation, revise following code if you want a different clock.
+#if CPU_FREQ != 48023000L
+       /* 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.
+       #endif
 #endif
 
 
-#if CPU_ARM_AT91SAM7S256 || CPU_ARM_AT91SAM7X256 || CPU_ARM_AT91SAM7X128
+#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