X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=cpu%2Fdetect.h;h=182472736f5f604ca4ff94381fd69b329bd670c6;hb=569cd794010c99ae8e3e2e37a207b0a2eaeb2c3f;hp=dd0e801fa74b148f78f9193b1cbf7fca2b124c0b;hpb=50cc352d570076bb1c5e6a79764da95681ef0887;p=bertos.git

diff --git a/cpu/detect.h b/cpu/detect.h
index dd0e801f..18247273 100644
--- a/cpu/detect.h
+++ b/cpu/detect.h
@@ -45,7 +45,6 @@
 		#define CPU_ARM_AT91         1
 		#define CPU_ARM_AT91SAM7S32  1
 	#else
-		#define CPU_ARM_AT91         0
 		#define CPU_ARM_AT91SAM7S32  0
 	#endif
 
@@ -53,7 +52,6 @@
 		#define CPU_ARM_AT91         1
 		#define CPU_ARM_AT91SAM7S64  1
 	#else
-		#define CPU_ARM_AT91         0
 		#define CPU_ARM_AT91SAM7S64  0
 	#endif
 
@@ -61,7 +59,6 @@
 		#define CPU_ARM_AT91         1
 		#define CPU_ARM_AT91SAM7S128 1
 	#else
-		#define CPU_ARM_AT91         0
 		#define CPU_ARM_AT91SAM7S128 0
 	#endif
 
@@ -69,15 +66,20 @@
 		#define CPU_ARM_AT91         1
 		#define CPU_ARM_AT91SAM7S256 1
 	#else
-		#define CPU_ARM_AT91         0
 		#define CPU_ARM_AT91SAM7S256 0
 	#endif
 
-	#if CPU_ARM_AT91SAM7S32 + CPU_ARM_AT91SAM7S64 \
-	  + CPU_ARM_AT91SAM7S128 + CPU_ARM_AT91SAM7S256 != 1
-		#error ARM CPU configuration error
+	#if defined(CPU_ARM_AT91)
+		#if CPU_ARM_AT91SAM7S32 + CPU_ARM_AT91SAM7S64 \
+		+ CPU_ARM_AT91SAM7S128 + CPU_ARM_AT91SAM7S256 != 1
+			#error ARM CPU configuration error
+		#endif
+	/* #elif Add other ARM families here */
+	#else
+		#define CPU_ATM_AT91         0
 	#endif
 
+
 	#if CPU_ARM_AT91 + 0 /* Add other ARM families here */ != 1
 		#error ARM CPU configuration error
 	#endif