projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add bertos jpeg logo binary dump.
[bertos.git]
/
bertos
/
cpu
/
detect.h
diff --git
a/bertos/cpu/detect.h
b/bertos/cpu/detect.h
index 739d3f6169cf0b35aaedc7f1de6942dd4bcd6b3d..401a1930a980b18d60f05d43655cb008974cf302 100644
(file)
--- a/
bertos/cpu/detect.h
+++ b/
bertos/cpu/detect.h
@@
-206,6
+206,14
@@
#define CPU_CM3_LM3S8962 0
#endif
#define CPU_CM3_LM3S8962 0
#endif
+ #if defined (__ARM_STM32F100RB__)
+ #define CPU_CM3_STM32 1
+ #define CPU_CM3_STM32F100RB 1
+ #define CPU_NAME "STM32F100RB"
+ #else
+ #define CPU_CM3_STM32F100RB 0
+ #endif
+
#if defined (__ARM_STM32F101C4__)
#define CPU_CM3_STM32 1
#define CPU_CM3_STM32F101C4 1
#if defined (__ARM_STM32F101C4__)
#define CPU_CM3_STM32 1
#define CPU_CM3_STM32F101C4 1
@@
-295,7
+303,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_STM32F101C4 + CPU_CM3_STM32F103RB + CPU_CM3_STM32F103RE + 0 != 1
+ #if CPU_CM3_STM32F10
0RB + CPU_CM3_STM32F10
1C4 + CPU_CM3_STM32F103RB + CPU_CM3_STM32F103RE + 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
@@
-328,9
+336,10
@@
#define CPU_CM3_LM3S8962 0
#define CPU_CM3_STM32 0
#define CPU_CM3_LM3S8962 0
#define CPU_CM3_STM32 0
+ #define CPU_CM3_STM32F100RB 0
#define CPU_CM3_STM32F103RB 0
#define CPU_CM3_STM32F101C4 0
#define CPU_CM3_STM32F103RB 0
#define CPU_CM3_STM32F101C4 0
- #define CPU_CM3_STM32F103RE 0
+
#define CPU_CM3_STM32F103RE 0
#define CPU_CM3_SAM3 0
#define CPU_CM3_SAM3N 0
#define CPU_CM3_SAM3 0
#define CPU_CM3_SAM3N 0
@@
-500,6
+509,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