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

diff --git a/cpu/detect.h b/cpu/detect.h
index dd0e801f..af2ecd07 100644
--- a/cpu/detect.h
+++ b/cpu/detect.h
@@ -41,11 +41,11 @@
 	#define CPU_ARM                 1
 	#define CPU_ID                  arm
 
+	// AT91SAM7S core family
 	#if defined(__ARM_AT91SAM7S32__)
 		#define CPU_ARM_AT91         1
 		#define CPU_ARM_AT91SAM7S32  1
 	#else
-		#define CPU_ARM_AT91         0
 		#define CPU_ARM_AT91SAM7S32  0
 	#endif
 
@@ -53,7 +53,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 +60,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 +67,38 @@
 		#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
+	// AT91SAM7X core family
+	#if defined(__ARM_AT91SAM7X128__)
+		#define CPU_ARM_AT91         1
+		#define CPU_ARM_AT91SAM7X128 1
+	#else
+		#define CPU_ARM_AT91SAM7X128 0
+	#endif
+
+	#if defined(__ARM_AT91SAM7X256__)
+		#define CPU_ARM_AT91         1
+		#define CPU_ARM_AT91SAM7X256 1
+	#else
+		#define CPU_ARM_AT91SAM7X256 0
 	#endif
 
+
+	#if defined(CPU_ARM_AT91)
+		#if CPU_ARM_AT91SAM7S32 + CPU_ARM_AT91SAM7S64 \
+		+ CPU_ARM_AT91SAM7S128 + CPU_ARM_AT91SAM7S256 \
+		+ CPU_ARM_AT91SAM7X128 + CPU_ARM_AT91SAM7X256 != 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
@@ -92,6 +113,8 @@
 	#define CPU_ARM_AT91SAM7S64     0
 	#define CPU_ARM_AT91SAM7S128    0
 	#define CPU_ARM_AT91SAM7S256    0
+	#define CPU_ARM_AT91SAM7X128    0
+	#define CPU_ARM_AT91SAM7X256    0
 #endif
 
 #if (defined(__IAR_SYSTEMS_ICC__) || defined(__IAR_SYSTEMS_ICC)) \