X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fcpu%2Fdetect.h;h=41b190f5b769fdd443c6eb98d14b6ee77768e45a;hb=0a06817da12212b29cac740066fe51c89e1084af;hp=ce462b2ea4b441f1b770a7c9a034cfac5450422b;hpb=457ded51e2bb0fb6daec2fc4073a0b1fef4f48ae;p=bertos.git

diff --git a/bertos/cpu/detect.h b/bertos/cpu/detect.h
index ce462b2e..41b190f5 100644
--- a/bertos/cpu/detect.h
+++ b/bertos/cpu/detect.h
@@ -231,6 +231,7 @@
 		#define CPU_CM3_SAM3U   0
 		#define CPU_CM3_SAM3N2  0
 		#define CPU_CM3_SAM3N1  0
+		#define CPU_CM3_SAM3X   0
 	#else
 		#define CPU_CM3_SAM3N4  0
 	#endif
@@ -243,6 +244,7 @@
 
 		#define CPU_CM3_SAM3N   0
 		#define CPU_CM3_SAM3U   0
+		#define CPU_CM3_SAM3X   0
 	#else
 		#define CPU_CM3_SAM3S4  0
 	#endif
@@ -255,10 +257,24 @@
 
 		#define CPU_CM3_SAM3N   0
 		#define CPU_CM3_SAM3S   0
+		#define CPU_CM3_SAM3X   0
 	#else
 		#define CPU_CM3_SAM3U4  0
 	#endif
 
+	#if defined (__ARM_SAM3X8__)
+		#define CPU_CM3_SAM3    1
+		#define CPU_CM3_SAM3X   1
+		#define CPU_CM3_SAM3X8  1
+		#define CPU_NAME        "SAM3X8"
+
+		#define CPU_CM3_SAM3N   0
+		#define CPU_CM3_SAM3S   0
+		#define CPU_CM3_SAM3U   0
+	#else
+		#define CPU_CM3_SAM3X8  0
+	#endif
+
 	#if defined (CPU_CM3_LM3S)
 		#if CPU_CM3_LM3S1968 + CPU_CM3_LM3S8962 + 0 != 1
 			#error Luminary Cortex-M3 CPU configuration error
@@ -272,10 +288,10 @@
 		#define CPU_CM3_LM3S        0
 		#define CPU_CM3_SAM3        0
 	#elif defined (CPU_CM3_SAM3)
-		#if CPU_CM3_SAM3N + 0 != 1
+		#if CPU_CM3_SAM3N + CPU_CM3_SAM3U + CPU_CM3_SAM3S + CPU_CM3_SAM3X + 0 != 1
 			#error SAM3 Cortex-M3 CPU configuration error
 		#endif
-		#if CPU_CM3_SAM3N4 + CPU_CM3_SAM3S4 + CPU_CM3_SAM3U4 + 0 != 1
+		#if CPU_CM3_SAM3N4 + CPU_CM3_SAM3S4 + CPU_CM3_SAM3U4 + CPU_CM3_SAM3X8 + 0 != 1
 			#error SAM3 Cortex-M3 CPU configuration error
 		#endif
 		#define CPU_CM3_LM3S        0
@@ -305,6 +321,8 @@
 	#define CPU_CM3_SAM3 0
 	#define CPU_CM3_SAM3N 0
 	#define CPU_CM3_SAM3N4 0
+	#define CPU_CM3_SAM3X 0
+	#define CPU_CM3_SAM3X8 0
 #endif
 
 #if (defined(__IAR_SYSTEMS_ICC__) || defined(__IAR_SYSTEMS_ICC)) \
@@ -432,9 +450,16 @@
 		#define CPU_AVR_ATMEGA1280  0
 	#endif
 
+	#if defined(__AVR_ATmega2560__)
+		#define CPU_AVR_ATMEGA2560  1
+		#define CPU_NAME            "ATmega2560"
+	#else
+		#define CPU_AVR_ATMEGA2560  0
+	#endif
+
 	#if CPU_AVR_ATMEGA32 + CPU_AVR_ATMEGA64 + CPU_AVR_ATMEGA103 + CPU_AVR_ATMEGA128 \
 	  + CPU_AVR_ATMEGA8 + CPU_AVR_ATMEGA168 + CPU_AVR_ATMEGA328P + CPU_AVR_ATMEGA1281 \
-	  + CPU_AVR_ATMEGA1280 != 1
+	  + CPU_AVR_ATMEGA1280 + CPU_AVR_ATMEGA2560 != 1
 		#error AVR CPU configuration error
 	#endif
 #else
@@ -448,6 +473,7 @@
 	#define CPU_AVR_ATMEGA128       0
 	#define CPU_AVR_ATMEGA1281      0
 	#define CPU_AVR_ATMEGA1280      0
+	#define CPU_AVR_ATMEGA2560      0
 #endif
 
 #if defined (__MSP430__)