From 4509aed48c757e1bd1466e643349cadbbb0c0e9d Mon Sep 17 00:00:00 2001 From: batt Date: Thu, 28 Aug 2008 14:21:23 +0000 Subject: [PATCH] Use the new ARCH_NIGHTTEST. git-svn-id: https://src.develer.com/svnoss/bertos/trunk@1743 38d2e660-2303-0410-9eaa-f027e97ec537 --- app/test/armtest.mk | 2 +- app/test/avrtest.mk | 2 +- bertos/cpu/arm/hw/crtat91sam7_rom.S | 6 +++++- bertos/verstag.h | 5 +++++ 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/app/test/armtest.mk b/app/test/armtest.mk index 8ab0460f..4a36082b 100644 --- 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 f2a6352b..a6ff97ff 100644 --- 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 c7706d73..ee00f7c8 100644 --- 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 +#include #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 b705cc03..ec9bc930 100644 --- 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 -- 2.25.1