X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fcpu%2Fdetect.h;h=33f6178cffa4efbc1d269f175ed21bfa646daa5e;hb=911d2706a86d326786bfe721dcc3d63aeade7f28;hp=d421f85e7c156364c9cce86ed3799f40d33d8255;hpb=6a566c9b4ad8efa9ee8432942b85ba31ffb469f8;p=bertos.git

diff --git a/bertos/cpu/detect.h b/bertos/cpu/detect.h
index d421f85e..33f6178c 100644
--- a/bertos/cpu/detect.h
+++ b/bertos/cpu/detect.h
@@ -185,17 +185,38 @@
 		#define CPU_CM3_LM3S1968    0
 	#endif
 
+	#if defined (__ARM_LM3S8962__)
+		#define CPU_CM3_LM3S        1
+		#define CPU_CM3_LM3S8962    1
+	#else
+		#define CPU_CM3_LM3S8962    0
+	#endif
+
+	#if defined (__ARM_STM32F103RB__)
+		#define CPU_CM3_STM32       1
+		#define CPU_CM3_STM32F103RB 1
+	#else
+		#define CPU_CM3_STM32F103RB 0
+	#endif
+
 	#if defined (CPU_CM3_LM3S)
-		#if CPU_CM3_LM3S1968 + 0 != 1
+		#if CPU_CM3_LM3S1968 + CPU_CM3_LM3S8962 + 0 != 1
 			#error Luminary Cortex-M3 CPU configuration error
 		#endif
+		#define CPU_CM3_STM32       0
+	#elif defined (CPU_CM3_STM32)
+		#if CPU_CM3_STM32F103RB + 0 != 1
+			#error STM32 Cortex-M3 CPU configuration error
+		#endif
+		#define CPU_CM3_LM3S        0
 	/* #elif Add other Cortex-M3 families here */
 	#else
 		#define CPU_CM3_LM3S        0
+		#define CPU_CM3_STM32       0
 	#endif
 
 
-	#if CPU_CM3_LM3S + 0 /* Add other Cortex-M3 families here */ != 1
+	#if CPU_CM3_LM3S + CPU_CM3_STM32 + 0 /* Add other Cortex-M3 families here */ != 1
 		#error Cortex-M3 CPU configuration error
 	#endif
 
@@ -205,6 +226,12 @@
 	#define CPU_CM3_LM3S 0
 
 	#define CPU_CM3_LM3S1968 0
+
+	#define CPU_CM3_LM3S8968 0
+
+	#define CPU_CM3_STM32 0
+
+	#define CPU_CM3_STM32F103RB 0
 #endif
 
 #if (defined(__IAR_SYSTEMS_ICC__) || defined(__IAR_SYSTEMS_ICC)) \