sam3 port: add CPU detect macros for SAM3S4 and SAM3U4.

[bertos.git] / bertos / cpu / detect.h

diff --git a/bertos/cpu/detect.h b/bertos/cpu/detect.h
index 1232ad69503baef77d2b20871434bf07861d00ee..1ece26e5046b499de7b8af16ffe8c94908405be3 100644 (file)
--- a/bertos/cpu/detect.h
+++ b/bertos/cpu/detect.h
@@ -40,7 +40,7 @@
        || defined(__ARM4TM__) /* IAR: defined for all cores >= 4tm */
        #define CPU_ARM 1
        #define CPU_ID  arm
-       #define CPU_CORE_NAME            "ARM"
+       #define CPU_CORE_NAME            "ARM7TDMI"
 
        // AT91SAM7S core family
        #if defined(__ARM_AT91SAM7S32__)
@@ -218,10 +218,37 @@
                #define CPU_CM3_AT91SAM3N   1
                #define CPU_CM3_AT91SAM3N4  1
                #define CPU_NAME            "AT91SAM3N4"
+
+               #define CPU_CM3_AT91SAM3S   0
+               #define CPU_CM3_AT91SAM3U   0
        #else
                #define CPU_CM3_AT91SAM3N4  0
        #endif
 
+       #if defined (__ARM_AT91SAM3S4__)
+               #define CPU_CM3_AT91SAM3    1
+               #define CPU_CM3_AT91SAM3S   1
+               #define CPU_CM3_AT91SAM3S4  1
+               #define CPU_NAME            "AT91SAM3S4"
+
+               #define CPU_CM3_AT91SAM3N   0
+               #define CPU_CM3_AT91SAM3U   0
+       #else
+               #define CPU_CM3_AT91SAM3S4  0
+       #endif
+
+       #if defined (__ARM_AT91SAM3U4__)
+               #define CPU_CM3_AT91SAM3    1
+               #define CPU_CM3_AT91SAM3U   1
+               #define CPU_CM3_AT91SAM3U4  1
+               #define CPU_NAME            "AT91SAM3U4"
+
+               #define CPU_CM3_AT91SAM3N   0
+               #define CPU_CM3_AT91SAM3S   0
+       #else
+               #define CPU_CM3_AT91SAM3U4  0
+       #endif
+
        #if defined (CPU_CM3_LM3S)
                #if CPU_CM3_LM3S1968 + CPU_CM3_LM3S8962 + 0 != 1
                        #error Luminary Cortex-M3 CPU configuration error
@@ -238,7 +265,7 @@
                #if CPU_CM3_AT91SAM3N + 0 != 1
                        #error AT91SAM3 Cortex-M3 CPU configuration error
                #endif
-               #if CPU_CM3_AT91SAM3N4 + 0 != 1
+               #if CPU_CM3_AT91SAM3N4 + CPU_CM3_AT91SAM3S4 + CPU_CM3_AT91SAM3U4 + 0 != 1
                        #error AT91SAM3 Cortex-M3 CPU configuration error
                #endif
                #define CPU_CM3_LM3S        0
@@ -415,7 +442,7 @@
 #if defined (__MSP430__)
        #define CPU_MSP430              1
        #define CPU_ID                  msp430
-       #define CPU_CORE_NAME           "MSP430"
+       #define CPU_CORE_NAME           "MSP430F2274"
 
        #if defined(__MSP430_2274__)
                #define CPU_MSP430_2274     1