X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fcpu%2Fdetect.h;h=4d1723952ddb98b7ba1b0d68c40875d2b167ecf8;hb=98a8fd716b70d7bca58463785ee287f48c0783e8;hp=a6c6baf4607a8c205c69345bc27bf59d5a5bab9e;hpb=4a3929fcd14a8dc8c84d8ad8b794f11de02f1fbc;p=bertos.git

diff --git a/bertos/cpu/detect.h b/bertos/cpu/detect.h
index a6c6baf4..4d172395 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 		 "ARM"
+	#define CPU_CORE_NAME 		 "ARM7TDMI"
 
 	// AT91SAM7S core family
 	#if defined(__ARM_AT91SAM7S32__)
@@ -218,10 +218,39 @@
 		#define CPU_CM3_AT91SAM3N   1
 		#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
@@ -238,7 +267,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
@@ -259,7 +288,7 @@
 	#define CPU_CM3 0
 	#define CPU_CM3_LM3S 0
 	#define CPU_CM3_LM3S1968 0
-	#define CPU_CM3_LM3S8968 0
+	#define CPU_CM3_LM3S8962 0
 
 	#define CPU_CM3_STM32 0
 	#define CPU_CM3_STM32F103RB 0
@@ -415,7 +444,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