X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fcpu%2Fdetect.h;h=c6a48b993b37ddd7152c6ca748673041656b9fe3;hb=bd646534b07bbf3c22a4d2ec01d800b0ad718aa6;hp=3b9ac1cf90bf3ae7032a6a242ac0ab0a6248f6fd;hpb=436b7ee6227b4836a571a642fd26c5c7d6db26ad;p=bertos.git

diff --git a/bertos/cpu/detect.h b/bertos/cpu/detect.h
index 3b9ac1cf..c6a48b99 100644
--- a/bertos/cpu/detect.h
+++ b/bertos/cpu/detect.h
@@ -85,6 +85,14 @@
 		#define CPU_ARM_AT91SAM7X256 0
 	#endif
 
+	#if defined (__ARM_LM3S1968__)
+		#define CPU_ARM_LM3S        1
+		#define CPU_ARM_LM3S1968    1
+	#else
+		#define CPU_ARM_LM3S1968    0
+	#endif
+
+
 
 	#if defined(CPU_ARM_AT91)
 		#if CPU_ARM_AT91SAM7S32 + CPU_ARM_AT91SAM7S64 \
@@ -92,15 +100,17 @@
 		+ CPU_ARM_AT91SAM7X128 + CPU_ARM_AT91SAM7X256 != 1
 			#error ARM CPU configuration error
 		#endif
+		#define CPU_ARM_LM3S        0
 
+	#elif defined (CPU_ARM_LM3S)
+		#if CPU_ARM_LM3S1968 + 0 != 1
+			#error Luminary ARM CPU configuration error
+		#endif
+		#define CPU_ARM_AT91        0
 	/* #elif Add other ARM families here */
-	#elif defined (__ARM_LM3S1968__)
-		#define CPU_ARM_LM3S		1
-		#define CPU_ARM_LM3S1968	1
-
-
 	#else
-		#define CPU_ARM_AT91         0
+		#define CPU_ARM_AT91        0
+		#define CPU_ARM_LM3S        0
 	#endif
 
 
@@ -112,6 +122,7 @@
 
 	/* ARM Families */
 	#define CPU_ARM_AT91            0
+	#define CPU_ARM_LM3S            0
 
 	/* ARM CPUs */
 	#define CPU_ARM_AT91SAM7S32     0
@@ -120,6 +131,8 @@
 	#define CPU_ARM_AT91SAM7S256    0
 	#define CPU_ARM_AT91SAM7X128    0
 	#define CPU_ARM_AT91SAM7X256    0
+
+	#define CPU_ARM_LM3S1968        0
 #endif
 
 #if (defined(__IAR_SYSTEMS_ICC__) || defined(__IAR_SYSTEMS_ICC)) \
@@ -179,6 +192,12 @@
 	#define CPU_AVR                 1
 	#define CPU_ID                  avr
 
+	#if defined(__AVR_ATmega32__)
+		#define CPU_AVR_ATMEGA32    1
+	#else
+		#define CPU_AVR_ATMEGA32    0
+	#endif
+
 	#if defined(__AVR_ATmega64__)
 		#define CPU_AVR_ATMEGA64    1
 	#else
@@ -215,7 +234,7 @@
 		#define CPU_AVR_ATMEGA1281  0
 	#endif
 
-	#if CPU_AVR_ATMEGA64 + CPU_AVR_ATMEGA103 + CPU_AVR_ATMEGA128 \
+	#if CPU_AVR_ATMEGA32 + CPU_AVR_ATMEGA64 + CPU_AVR_ATMEGA103 + CPU_AVR_ATMEGA128 \
 	  + CPU_AVR_ATMEGA8 + CPU_AVR_ATMEGA168 + CPU_AVR_ATMEGA1281 != 1
 		#error AVR CPU configuration error
 	#endif
@@ -223,6 +242,7 @@
 	#define CPU_AVR                 0
 	#define CPU_AVR_ATMEGA8         0
 	#define CPU_AVR_ATMEGA168       0
+	#define CPU_AVR_ATMEGA32        0
 	#define CPU_AVR_ATMEGA64        0
 	#define CPU_AVR_ATMEGA103       0
 	#define CPU_AVR_ATMEGA128       0