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

diff --git a/bertos/cpu/detect.h b/bertos/cpu/detect.h
index 1ece26e5..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__)
@@ -221,6 +221,8 @@
 
 		#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
@@ -442,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