projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Silent nightlytest warning.
[bertos.git]
/
bertos
/
cpu
/
detect.h
diff --git
a/bertos/cpu/detect.h
b/bertos/cpu/detect.h
index fe940cb07082149429c2f6a20190aaf3df4f6a53..7e0d0835841976c948a4b46bca71152f8d546ffd 100644
(file)
--- a/
bertos/cpu/detect.h
+++ b/
bertos/cpu/detect.h
@@
-192,17
+192,31
@@
#define CPU_CM3_LM3S8962 0
#endif
#define CPU_CM3_LM3S8962 0
#endif
+ #if defined (__ARM_STM32F103RB__)
+ #define CPU_CM3_STM32 1
+ #define CPU_CM3_STM32F103RB 1
+ #else
+ #define CPU_CM3_STM32F103RB 0
+ #endif
+
#if defined (CPU_CM3_LM3S)
#if CPU_CM3_LM3S1968 + CPU_CM3_LM3S8962 + 0 != 1
#error Luminary Cortex-M3 CPU configuration error
#endif
#if defined (CPU_CM3_LM3S)
#if CPU_CM3_LM3S1968 + CPU_CM3_LM3S8962 + 0 != 1
#error Luminary Cortex-M3 CPU configuration error
#endif
+ #define CPU_CM3_STM32 0
+ #elif defined (CPU_CM3_STM32)
+ #if CPU_CM3_STM32F103RB + 0 != 1
+ #error STM32 Cortex-M3 CPU configuration error
+ #endif
+ #define CPU_CM3_LM3S 0
/* #elif Add other Cortex-M3 families here */
#else
#define CPU_CM3_LM3S 0
/* #elif Add other Cortex-M3 families here */
#else
#define CPU_CM3_LM3S 0
+ #define CPU_CM3_STM32 0
#endif
#endif
- #if CPU_CM3_LM3S + 0 /* Add other Cortex-M3 families here */ != 1
+ #if CPU_CM3_LM3S +
CPU_CM3_STM32 +
0 /* Add other Cortex-M3 families here */ != 1
#error Cortex-M3 CPU configuration error
#endif
#error Cortex-M3 CPU configuration error
#endif
@@
-214,6
+228,10
@@
#define CPU_CM3_LM3S1968 0
#define CPU_CM3_LM3S8968 0
#define CPU_CM3_LM3S1968 0
#define CPU_CM3_LM3S8968 0
+
+ #define CPU_CM3_STM32 0
+
+ #define CPU_CM3_STM32F103RB 0
#endif
#if (defined(__IAR_SYSTEMS_ICC__) || defined(__IAR_SYSTEMS_ICC)) \
#endif
#if (defined(__IAR_SYSTEMS_ICC__) || defined(__IAR_SYSTEMS_ICC)) \
@@
-321,8
+339,15
@@
#define CPU_AVR_ATMEGA1281 0
#endif
#define CPU_AVR_ATMEGA1281 0
#endif
+ #if defined(__AVR_ATmega1280__)
+ #define CPU_AVR_ATMEGA1280 1
+ #else
+ #define CPU_AVR_ATMEGA1280 0
+ #endif
+
#if CPU_AVR_ATMEGA32 + CPU_AVR_ATMEGA64 + CPU_AVR_ATMEGA103 + CPU_AVR_ATMEGA128 \
#if CPU_AVR_ATMEGA32 + CPU_AVR_ATMEGA64 + CPU_AVR_ATMEGA103 + CPU_AVR_ATMEGA128 \
- + CPU_AVR_ATMEGA8 + CPU_AVR_ATMEGA168 + CPU_AVR_ATMEGA328P + CPU_AVR_ATMEGA1281 != 1
+ + CPU_AVR_ATMEGA8 + CPU_AVR_ATMEGA168 + CPU_AVR_ATMEGA328P + CPU_AVR_ATMEGA1281 \
+ + CPU_AVR_ATMEGA1280 != 1
#error AVR CPU configuration error
#endif
#else
#error AVR CPU configuration error
#endif
#else
@@
-335,6
+360,7
@@
#define CPU_AVR_ATMEGA103 0
#define CPU_AVR_ATMEGA128 0
#define CPU_AVR_ATMEGA1281 0
#define CPU_AVR_ATMEGA103 0
#define CPU_AVR_ATMEGA128 0
#define CPU_AVR_ATMEGA1281 0
+ #define CPU_AVR_ATMEGA1280 0
#endif
#endif