projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename to insert project into the nightly test.
[bertos.git]
/
bertos
/
cpu
/
detect.h
diff --git
a/bertos/cpu/detect.h
b/bertos/cpu/detect.h
index 045824c1c3aebd94ae4fb4d1e0b3a3d6ccc13b5d..5c9438d28de4f9f42a6f131914a553520f08c90f 100644
(file)
--- a/
bertos/cpu/detect.h
+++ b/
bertos/cpu/detect.h
@@
-221,6
+221,14
@@
#else
#define CPU_CM3_STM32F101C4 0
#endif
#else
#define CPU_CM3_STM32F101C4 0
#endif
+
+ #if defined (__ARM_STM32F102C4__)
+ #define CPU_CM3_STM32 1
+ #define CPU_CM3_STM32F102C4 1
+ #define CPU_NAME "STM32F102C4"
+ #else
+ #define CPU_CM3_STM32F102C4 0
+ #endif
#if defined (__ARM_STM32F103RB__)
#define CPU_CM3_STM32 1
#if defined (__ARM_STM32F103RB__)
#define CPU_CM3_STM32 1
@@
-303,7
+311,7
@@
#define CPU_CM3_STM32 0
#define CPU_CM3_SAM3 0
#elif defined (CPU_CM3_STM32)
#define CPU_CM3_STM32 0
#define CPU_CM3_SAM3 0
#elif defined (CPU_CM3_STM32)
- #if CPU_CM3_STM32F100RB + CPU_CM3_STM32F101C4 + CPU_CM3_STM32F103RB + CPU_CM3_STM32F103RE + 0 != 1
+ #if CPU_CM3_STM32F100RB + CPU_CM3_STM32F101C4 + CPU_CM3_STM32F103RB + CPU_CM3_STM32F103RE +
CPU_CM3_STM32F102C4 +
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
@@
-509,6
+517,7
@@
#error CPU cannot be MEGA and XMEGA
#elif defined(CPU_AVR_MEGA)
#define CPU_AVR_XMEGA 0
#error CPU cannot be MEGA and XMEGA
#elif defined(CPU_AVR_MEGA)
#define CPU_AVR_XMEGA 0
+ #define CPU_AVR_XMEGA_D 0
#elif defined(CPU_AVR_XMEGA)
#define CPU_AVR_MEGA 0
#endif
#elif defined(CPU_AVR_XMEGA)
#define CPU_AVR_MEGA 0
#endif