Use the new ARCH_NIGHTTEST.

git-svn-id: https://src.develer.com/svnoss/bertos/trunk@1743 38d2e660-2303-0410-9eaa-f027e97ec537

diff --git a/app/test/armtest.mk b/app/test/armtest.mk
index 8ab0460f1286a482ab312b39c980137689730878..4a36082bbd13839fe97e86bac02317c17db6487b 100644 (file)
--- a/app/test/armtest.mk
+++ b/app/test/armtest.mk
@@ -25,7 +25,7 @@ armtest_CPPASRC = $(arm_ASRC)
 armtest_CROSS = arm-elf-
 
 armtest_CPPAFLAGS = -O0 -g -gdwarf-2 -g -gen-debug
-armtest_CPPFLAGS = -O0 -D'ARCH=0xFFFFFF' -D__ARM_AT91SAM7S256__ -g3 -gdwarf-2 -fverbose-asm -Iapp/test -Ibertos/cpu/arm
+armtest_CPPFLAGS = -O0 -D'ARCH=ARCH_NIGHTTEST' -D__ARM_AT91SAM7S256__ -g3 -gdwarf-2 -fverbose-asm -Iapp/test -Ibertos/cpu/arm
 armtest_LDFLAGS = -nostartfiles -T bertos/cpu/arm/scripts/at91sam7_256_rom.ld -Wl,--no-warn-mismatch
 
 armtest_CPU = arm7tdmi

diff --git a/app/test/avrtest.mk b/app/test/avrtest.mk
index f2a6352b4af2c30da9460febb6de5defd6e4bdff..a6ff97ff5ba53e580266093c5760638b2a155332 100644 (file)
--- a/app/test/avrtest.mk
+++ b/app/test/avrtest.mk
@@ -28,5 +28,5 @@ avrtest_CPPASRC = $(avr_ASRC)
 avrtest_PCSRC += bertos/mware/formatwr.c
 
 avrtest_CROSS = avr-
-avrtest_CPPFLAGS = -D'ARCH=1' -Iapp/test -Ibertos/cpu/avr 
+avrtest_CPPFLAGS = -D'ARCH=ARCH_NIGHTTEST' -Iapp/test -Ibertos/cpu/avr 
 avrtest_CFLAGS = -Os -mcall-prologues -fno-strict-aliasing

diff --git a/bertos/cpu/arm/hw/crtat91sam7_rom.S b/bertos/cpu/arm/hw/crtat91sam7_rom.S
index c7706d73ffbaa9135af0751d6e7c4d67ec47b3d1..ee00f7c8651e5d6eb0d296028dc91a022812222f 100644 (file)
--- a/bertos/cpu/arm/hw/crtat91sam7_rom.S
+++ b/bertos/cpu/arm/hw/crtat91sam7_rom.S
@@ -72,10 +72,14 @@
 
 #include "hw/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.
+       /* Avoid errors on nightly test */
+       #if !defined(ARCH_NIGHTTEST) || !(ARCH & ARCH_NIGHTTEST)
+               #error Clock registers set for 48MHz operation, revise following code if you want a different clock.
+       #endif
 #endif
 
 

diff --git a/bertos/verstag.h b/bertos/verstag.h
index b705cc0359c1e18fb85b312fac318c641c044d98..ec9bc93017638720ed5881bdbaa6f312d407a7c1 100644 (file)
--- a/bertos/verstag.h
+++ b/bertos/verstag.h
@@ -62,6 +62,11 @@
        #define VERS_MINOR 1
        #define VERS_REV   0
        #define VERS_LETTER ""
+#elif ARCH & ARCH_NIGHTTEST
+       #define VERS_MAJOR 0
+       #define VERS_MINOR 1
+       #define VERS_REV   0
+       #define VERS_LETTER ""
 #else
        #error unknown architecture
 #endif