projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
CM3: allow to define function in RAM by the RAM_FUNC macro
[bertos.git]
/
bertos
/
cpu
/
detect.h
diff --git
a/bertos/cpu/detect.h
b/bertos/cpu/detect.h
index 7b57ae70fa65b45a16dd1bb19f83200f5e83e8dc..e14ca222a7b57ce138c0f0dc1dd0a88a59e65285 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
@@
-258,7
+266,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_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
@@
-292,6
+300,7
@@
#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_SAM3 0
#define CPU_CM3_SAM3N 0
#define CPU_CM3_SAM3 0
#define CPU_CM3_SAM3N 0
@@
-423,9
+432,16
@@
#define CPU_AVR_ATMEGA1280 0
#endif
#define CPU_AVR_ATMEGA1280 0
#endif
+ #if defined(__AVR_ATmega2560__)
+ #define CPU_AVR_ATMEGA2560 1
+ #define CPU_NAME "ATmega2560"
+ #else
+ #define CPU_AVR_ATMEGA2560 0
+ #endif
+
#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 \
#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 \
- + CPU_AVR_ATMEGA1280 != 1
+ + CPU_AVR_ATMEGA1280
+ CPU_AVR_ATMEGA2560
!= 1
#error AVR CPU configuration error
#endif
#else
#error AVR CPU configuration error
#endif
#else
@@
-439,6
+455,7
@@
#define CPU_AVR_ATMEGA128 0
#define CPU_AVR_ATMEGA1281 0
#define CPU_AVR_ATMEGA1280 0
#define CPU_AVR_ATMEGA128 0
#define CPU_AVR_ATMEGA1281 0
#define CPU_AVR_ATMEGA1280 0
+ #define CPU_AVR_ATMEGA2560 0
#endif
#if defined (__MSP430__)
#endif
#if defined (__MSP430__)