projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Switch to new disk write interface:the disk should now supply the write buffer.
[bertos.git]
/
bertos
/
cpu
/
detect.h
diff --git
a/bertos/cpu/detect.h
b/bertos/cpu/detect.h
index af2ecd0788a900f0641a0ae6268fcff4eb5142d0..f37d952574038199116e9de25d6051051e1a0367 100644
(file)
--- a/
bertos/cpu/detect.h
+++ b/
bertos/cpu/detect.h
@@
-94,12
+94,17
@@
#endif
/* #elif Add other ARM families here */
#endif
/* #elif Add other ARM families here */
+ #elif defined (__ARM_LM3S1968__)
+ #define CPU_ARM_LM3S 1
+ #define CPU_ARM_LM3S1968 1
+
+
#else
#else
- #define CPU_A
T
M_AT91 0
+ #define CPU_A
R
M_AT91 0
#endif
#endif
- #if CPU_ARM_AT91 + 0 /* Add other ARM families here */ != 1
+ #if CPU_ARM_AT91 +
CPU_ARM_LM3S +
0 /* Add other ARM families here */ != 1
#error ARM CPU configuration error
#endif
#else
#error ARM CPU configuration error
#endif
#else
@@
-174,6
+179,12
@@
#define CPU_AVR 1
#define CPU_ID avr
#define CPU_AVR 1
#define CPU_ID avr
+ #if defined(__AVR_ATmega32__)
+ #define CPU_AVR_ATMEGA32 1
+ #else
+ #define CPU_AVR_ATMEGA32 0
+ #endif
+
#if defined(__AVR_ATmega64__)
#define CPU_AVR_ATMEGA64 1
#else
#if defined(__AVR_ATmega64__)
#define CPU_AVR_ATMEGA64 1
#else
@@
-210,7
+221,7
@@
#define CPU_AVR_ATMEGA1281 0
#endif
#define CPU_AVR_ATMEGA1281 0
#endif
- #if CPU_AVR_ATMEGA64 + CPU_AVR_ATMEGA103 + CPU_AVR_ATMEGA128 \
+ #if CPU_AVR_ATMEGA
32 + CPU_AVR_ATMEGA
64 + CPU_AVR_ATMEGA103 + CPU_AVR_ATMEGA128 \
+ CPU_AVR_ATMEGA8 + CPU_AVR_ATMEGA168 + CPU_AVR_ATMEGA1281 != 1
#error AVR CPU configuration error
#endif
+ CPU_AVR_ATMEGA8 + CPU_AVR_ATMEGA168 + CPU_AVR_ATMEGA1281 != 1
#error AVR CPU configuration error
#endif
@@
-218,6
+229,7
@@
#define CPU_AVR 0
#define CPU_AVR_ATMEGA8 0
#define CPU_AVR_ATMEGA168 0
#define CPU_AVR 0
#define CPU_AVR_ATMEGA8 0
#define CPU_AVR_ATMEGA168 0
+ #define CPU_AVR_ATMEGA32 0
#define CPU_AVR_ATMEGA64 0
#define CPU_AVR_ATMEGA103 0
#define CPU_AVR_ATMEGA128 0
#define CPU_AVR_ATMEGA64 0
#define CPU_AVR_ATMEGA103 0
#define CPU_AVR_ATMEGA128 0