X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fcpu%2Fdetect.h;h=7e0d0835841976c948a4b46bca71152f8d546ffd;hb=06c52c673046e0c9de065a21a9ba22ad78ace7e1;hp=7e9c23198a24fb4100c3514eb93b7eaba1876346;hpb=c904e252f872318aa2014f0ef1079a08aedaaed0;p=bertos.git

diff --git a/bertos/cpu/detect.h b/bertos/cpu/detect.h
index 7e9c2319..7e0d0835 100644
--- a/bertos/cpu/detect.h
+++ b/bertos/cpu/detect.h
@@ -192,11 +192,11 @@
 		#define CPU_CM3_LM3S8962    0
 	#endif
 
-	#if defined (__ARM_STM32P103__)
+	#if defined (__ARM_STM32F103RB__)
 		#define CPU_CM3_STM32       1
-		#define CPU_CM3_STM32P103   1
+		#define CPU_CM3_STM32F103RB 1
 	#else
-		#define CPU_CM3_STM32P103   0
+		#define CPU_CM3_STM32F103RB 0
 	#endif
 
 	#if defined (CPU_CM3_LM3S)
@@ -205,7 +205,7 @@
 		#endif
 		#define CPU_CM3_STM32       0
 	#elif defined (CPU_CM3_STM32)
-		#if CPU_CM3_STM32P103 + 0 != 1
+		#if CPU_CM3_STM32F103RB + 0 != 1
 			#error STM32 Cortex-M3 CPU configuration error
 		#endif
 		#define CPU_CM3_LM3S        0
@@ -231,7 +231,7 @@
 
 	#define CPU_CM3_STM32 0
 
-	#define CPU_CM3_STM32P103 0
+	#define CPU_CM3_STM32F103RB 0
 #endif
 
 #if (defined(__IAR_SYSTEMS_ICC__) || defined(__IAR_SYSTEMS_ICC)) \
@@ -339,8 +339,15 @@
 		#define CPU_AVR_ATMEGA1281  0
 	#endif
 
+	#if defined(__AVR_ATmega1280__)
+		#define CPU_AVR_ATMEGA1280  1
+	#else
+		#define CPU_AVR_ATMEGA1280  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 != 1
+	  + CPU_AVR_ATMEGA8 + CPU_AVR_ATMEGA168 + CPU_AVR_ATMEGA328P + CPU_AVR_ATMEGA1281 \
+	  + CPU_AVR_ATMEGA1280 != 1
 		#error AVR CPU configuration error
 	#endif
 #else
@@ -353,6 +360,7 @@
 	#define CPU_AVR_ATMEGA103       0
 	#define CPU_AVR_ATMEGA128       0
 	#define CPU_AVR_ATMEGA1281      0
+	#define CPU_AVR_ATMEGA1280      0
 #endif