projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge from trunk.
[bertos.git]
/
bertos
/
cpu
/
arm
/
hw
/
switch_arm.S
diff --git
a/bertos/cpu/arm/hw/switch_arm.S
b/bertos/cpu/arm/hw/switch_arm.S
index 38ceff8e32d0aff19f3e548509508e9d789e0093..0e7d697205189a6deb043e3a208aa16270cbe16d 100644
(file)
--- a/
bertos/cpu/arm/hw/switch_arm.S
+++ b/
bertos/cpu/arm/hw/switch_arm.S
@@
-1,2
+1,6
@@
-#warning This file is deprecated, use switch_ctx_arm.S
-#include "switch_ctx_arm.S"
+#include <cfg/cfg_arch.h>
+
+#if !(ARCH & ARCH_NIGHTTEST)
+ #warning This file is deprecated, use switch_ctx_arm.S
+ #include "switch_ctx_arm.S"
+#endif