projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove arduino preset from night_test awaiting the avr toolchain updates on building...
[bertos.git]
/
bertos
/
cpu
/
detect.h
diff --git
a/bertos/cpu/detect.h
b/bertos/cpu/detect.h
index 985d18e124df71e9bf529c454e576cc3a485c5a8..ce462b2ea4b441f1b770a7c9a034cfac5450422b 100644
(file)
--- a/
bertos/cpu/detect.h
+++ b/
bertos/cpu/detect.h
@@
-205,6
+205,14
@@
#define CPU_CM3_LM3S8962 0
#endif
#define CPU_CM3_LM3S8962 0
#endif
+ #if defined (__ARM_STM32F101C4__)
+ #define CPU_CM3_STM32 1
+ #define CPU_CM3_STM32F101C4 1
+ #define CPU_NAME "STM32F101C4"
+ #else
+ #define CPU_CM3_STM32F101C4 0
+ #endif
+
#if defined (__ARM_STM32F103RB__)
#define CPU_CM3_STM32 1
#define CPU_CM3_STM32F103RB 1
#if defined (__ARM_STM32F103RB__)
#define CPU_CM3_STM32 1
#define CPU_CM3_STM32F103RB 1
@@
-213,42
+221,42
@@
#define CPU_CM3_STM32F103RB 0
#endif
#define CPU_CM3_STM32F103RB 0
#endif
- #if defined (__ARM_
AT91
SAM3N4__)
- #define CPU_CM3_
AT91
SAM3 1
- #define CPU_CM3_
AT91
SAM3N 1
- #define CPU_CM3_
AT91
SAM3N4 1
- #define CPU_NAME
"AT91
SAM3N4"
+ #if defined (__ARM_SAM3N4__)
+ #define CPU_CM3_SAM3 1
+ #define CPU_CM3_SAM3N 1
+ #define CPU_CM3_SAM3N4 1
+ #define CPU_NAME
"
SAM3N4"
- #define CPU_CM3_
AT91
SAM3S 0
- #define CPU_CM3_
AT91
SAM3U 0
- #define CPU_CM3_
AT91
SAM3N2 0
- #define CPU_CM3_
AT91
SAM3N1 0
+ #define CPU_CM3_SAM3S 0
+ #define CPU_CM3_SAM3U 0
+ #define CPU_CM3_SAM3N2 0
+ #define CPU_CM3_SAM3N1 0
#else
#else
- #define CPU_CM3_
AT91
SAM3N4 0
+ #define CPU_CM3_SAM3N4 0
#endif
#endif
- #if defined (__ARM_
AT91
SAM3S4__)
- #define CPU_CM3_
AT91
SAM3 1
- #define CPU_CM3_
AT91
SAM3S 1
- #define CPU_CM3_
AT91
SAM3S4 1
- #define CPU_NAME
"AT91
SAM3S4"
+ #if defined (__ARM_SAM3S4__)
+ #define CPU_CM3_SAM3 1
+ #define CPU_CM3_SAM3S 1
+ #define CPU_CM3_SAM3S4 1
+ #define CPU_NAME
"
SAM3S4"
- #define CPU_CM3_
AT91
SAM3N 0
- #define CPU_CM3_
AT91
SAM3U 0
+ #define CPU_CM3_SAM3N 0
+ #define CPU_CM3_SAM3U 0
#else
#else
- #define CPU_CM3_
AT91
SAM3S4 0
+ #define CPU_CM3_SAM3S4 0
#endif
#endif
- #if defined (__ARM_
AT91
SAM3U4__)
- #define CPU_CM3_
AT91
SAM3 1
- #define CPU_CM3_
AT91
SAM3U 1
- #define CPU_CM3_
AT91
SAM3U4 1
- #define CPU_NAME
"AT91
SAM3U4"
+ #if defined (__ARM_SAM3U4__)
+ #define CPU_CM3_SAM3 1
+ #define CPU_CM3_SAM3U 1
+ #define CPU_CM3_SAM3U4 1
+ #define CPU_NAME
"
SAM3U4"
- #define CPU_CM3_
AT91
SAM3N 0
- #define CPU_CM3_
AT91
SAM3S 0
+ #define CPU_CM3_SAM3N 0
+ #define CPU_CM3_SAM3S 0
#else
#else
- #define CPU_CM3_
AT91
SAM3U4 0
+ #define CPU_CM3_SAM3U4 0
#endif
#if defined (CPU_CM3_LM3S)
#endif
#if defined (CPU_CM3_LM3S)
@@
-256,19
+264,19
@@
#error Luminary Cortex-M3 CPU configuration error
#endif
#define CPU_CM3_STM32 0
#error Luminary Cortex-M3 CPU configuration error
#endif
#define CPU_CM3_STM32 0
- #define CPU_CM3_
AT91SAM3
0
+ #define CPU_CM3_
SAM3
0
#elif defined (CPU_CM3_STM32)
#elif defined (CPU_CM3_STM32)
- #if CPU_CM3_STM32F103RB + 0 != 1
+ #if CPU_CM3_STM32F10
1C4 + CPU_CM3_STM32F10
3RB + 0 != 1
#error STM32 Cortex-M3 CPU configuration error
#endif
#define CPU_CM3_LM3S 0
#error STM32 Cortex-M3 CPU configuration error
#endif
#define CPU_CM3_LM3S 0
- #define CPU_CM3_
AT91SAM3
0
- #elif defined (CPU_CM3_
AT91
SAM3)
- #if CPU_CM3_
AT91
SAM3N + 0 != 1
- #error
AT91
SAM3 Cortex-M3 CPU configuration error
+ #define CPU_CM3_
SAM3
0
+ #elif defined (CPU_CM3_SAM3)
+ #if CPU_CM3_SAM3N + 0 != 1
+ #error SAM3 Cortex-M3 CPU configuration error
#endif
#endif
- #if CPU_CM3_
AT91SAM3N4 + CPU_CM3_AT91SAM3S4 + CPU_CM3_AT91
SAM3U4 + 0 != 1
- #error
AT91
SAM3 Cortex-M3 CPU configuration error
+ #if CPU_CM3_
SAM3N4 + CPU_CM3_SAM3S4 + CPU_CM3_
SAM3U4 + 0 != 1
+ #error SAM3 Cortex-M3 CPU configuration error
#endif
#define CPU_CM3_LM3S 0
#define CPU_CM3_STM32 0
#endif
#define CPU_CM3_LM3S 0
#define CPU_CM3_STM32 0
@@
-276,11
+284,11
@@
#else
#define CPU_CM3_LM3S 0
#define CPU_CM3_STM32 0
#else
#define CPU_CM3_LM3S 0
#define CPU_CM3_STM32 0
- #define CPU_CM3_
AT91SAM3
0
+ #define CPU_CM3_
SAM3
0
#endif
#endif
- #if CPU_CM3_LM3S + CPU_CM3_STM32 + CPU_CM3_
AT91
SAM3 + 0 /* Add other Cortex-M3 families here */ != 1
+ #if CPU_CM3_LM3S + CPU_CM3_STM32 + CPU_CM3_SAM3 + 0 /* Add other Cortex-M3 families here */ != 1
#error Cortex-M3 CPU configuration error
#endif
#error Cortex-M3 CPU configuration error
#endif
@@
-292,10
+300,11
@@
#define CPU_CM3_STM32 0
#define CPU_CM3_STM32F103RB 0
#define CPU_CM3_STM32 0
#define CPU_CM3_STM32F103RB 0
+ #define CPU_CM3_STM32F101C4 0
- #define CPU_CM3_
AT91
SAM3 0
- #define CPU_CM3_
AT91
SAM3N 0
- #define CPU_CM3_
AT91
SAM3N4 0
+ #define CPU_CM3_SAM3 0
+ #define CPU_CM3_SAM3N 0
+ #define CPU_CM3_SAM3N4 0
#endif
#if (defined(__IAR_SYSTEMS_ICC__) || defined(__IAR_SYSTEMS_ICC)) \
#endif
#if (defined(__IAR_SYSTEMS_ICC__) || defined(__IAR_SYSTEMS_ICC)) \