projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Modify the module selection page
[bertos.git]
/
bertos
/
cpu
/
detect.h
diff --git
a/bertos/cpu/detect.h
b/bertos/cpu/detect.h
index f37d952574038199116e9de25d6051051e1a0367..c6a48b993b37ddd7152c6ca748673041656b9fe3 100644
(file)
--- a/
bertos/cpu/detect.h
+++ b/
bertos/cpu/detect.h
@@
-85,6
+85,14
@@
#define CPU_ARM_AT91SAM7X256 0
#endif
#define CPU_ARM_AT91SAM7X256 0
#endif
+ #if defined (__ARM_LM3S1968__)
+ #define CPU_ARM_LM3S 1
+ #define CPU_ARM_LM3S1968 1
+ #else
+ #define CPU_ARM_LM3S1968 0
+ #endif
+
+
#if defined(CPU_ARM_AT91)
#if CPU_ARM_AT91SAM7S32 + CPU_ARM_AT91SAM7S64 \
#if defined(CPU_ARM_AT91)
#if CPU_ARM_AT91SAM7S32 + CPU_ARM_AT91SAM7S64 \
@@
-92,15
+100,17
@@
+ CPU_ARM_AT91SAM7X128 + CPU_ARM_AT91SAM7X256 != 1
#error ARM CPU configuration error
#endif
+ CPU_ARM_AT91SAM7X128 + CPU_ARM_AT91SAM7X256 != 1
#error ARM CPU configuration error
#endif
+ #define CPU_ARM_LM3S 0
+ #elif defined (CPU_ARM_LM3S)
+ #if CPU_ARM_LM3S1968 + 0 != 1
+ #error Luminary ARM CPU configuration error
+ #endif
+ #define CPU_ARM_AT91 0
/* #elif Add other ARM families here */
/* #elif Add other ARM families here */
- #elif defined (__ARM_LM3S1968__)
- #define CPU_ARM_LM3S 1
- #define CPU_ARM_LM3S1968 1
-
-
#else
#else
- #define CPU_ARM_AT91 0
+ #define CPU_ARM_AT91 0
+ #define CPU_ARM_LM3S 0
#endif
#endif
@@
-112,6
+122,7
@@
/* ARM Families */
#define CPU_ARM_AT91 0
/* ARM Families */
#define CPU_ARM_AT91 0
+ #define CPU_ARM_LM3S 0
/* ARM CPUs */
#define CPU_ARM_AT91SAM7S32 0
/* ARM CPUs */
#define CPU_ARM_AT91SAM7S32 0
@@
-120,6
+131,8
@@
#define CPU_ARM_AT91SAM7S256 0
#define CPU_ARM_AT91SAM7X128 0
#define CPU_ARM_AT91SAM7X256 0
#define CPU_ARM_AT91SAM7S256 0
#define CPU_ARM_AT91SAM7X128 0
#define CPU_ARM_AT91SAM7X256 0
+
+ #define CPU_ARM_LM3S1968 0
#endif
#if (defined(__IAR_SYSTEMS_ICC__) || defined(__IAR_SYSTEMS_ICC)) \
#endif
#if (defined(__IAR_SYSTEMS_ICC__) || defined(__IAR_SYSTEMS_ICC)) \