X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fcpu%2Fdetect.h;h=985d18e124df71e9bf529c454e576cc3a485c5a8;hb=8f98ebb808578ccfef32b52dae753510e284fc9d;hp=e64679bad5a45e4c3697a6e4bd48187ad22a00f6;hpb=2a5345bb8fb2dc3d2ab553eedbacb41703bf7d9d;p=bertos.git

diff --git a/bertos/cpu/detect.h b/bertos/cpu/detect.h
index e64679ba..985d18e1 100644
--- 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 		 "ARM7TDMI"
+	#define CPU_CORE_NAME		 "ARM7TDMI"
 
 	// AT91SAM7S core family
 	#if defined(__ARM_AT91SAM7S32__)
@@ -219,12 +219,38 @@
 		#define CPU_CM3_AT91SAM3N4  1
 		#define CPU_NAME            "AT91SAM3N4"
 
+		#define CPU_CM3_AT91SAM3S   0
+		#define CPU_CM3_AT91SAM3U   0
 		#define CPU_CM3_AT91SAM3N2  0
 		#define CPU_CM3_AT91SAM3N1  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
@@ -241,7 +267,7 @@
 		#if CPU_CM3_AT91SAM3N + 0 != 1
 			#error AT91SAM3 Cortex-M3 CPU configuration error
 		#endif
-		#if CPU_CM3_AT91SAM3N4 + CPU_CM3_AT91SAM3N2 + CPU_CM3_AT91SAM3N1 + 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
@@ -418,16 +444,29 @@
 #if defined (__MSP430__)
 	#define CPU_MSP430              1
 	#define CPU_ID                  msp430
-	#define CPU_CORE_NAME           "MSP430F2274"
+	#define CPU_CORE_NAME           "MSP430"
 
-	#if defined(__MSP430_2274__)
-		#define CPU_MSP430_2274     1
-		#define CPU_NAME            "2274"
+	#if defined(__MSP430F2274__)
+		#define CPU_MSP430F2274     1
+		#define CPU_NAME            "MSP430F2274"
 	#else
-		#define CPU_MSP430_2274     0
+		#define CPU_MSP430F2274     0
+	#endif
+
+	#if defined(__MSP430G2231__)
+		#define CPU_MSP430G2231     1
+		#define CPU_NAME            "MSP430G2231"
+	#else
+		#define CPU_MSP430G2231     0
+	#endif
+
+	#if CPU_MSP430F2274 + CPU_MSP430G2231 != 1
+		#error MSP430 CPU configuration error
 	#endif
 #else
-	#define CPU_MSP430              0
+	#define CPU_MSP430                  0
+	#define CPU_MSP430F2274             0
+	#define CPU_MSP430G2231             0
 #endif