From: aleph Date: Fri, 15 Oct 2010 19:56:28 +0000 (+0000) Subject: sam3 port: add CPU detect macros for SAM3S4 and SAM3U4. X-Git-Tag: 2.6.0~5^2~85 X-Git-Url: https://codewiz.org/gitweb?p=bertos.git;a=commitdiff_plain;h=78c2d08d43a58d8579fd3993b1798b82b39a3703 sam3 port: add CPU detect macros for SAM3S4 and SAM3U4. git-svn-id: https://src.develer.com/svnoss/bertos/trunk@4435 38d2e660-2303-0410-9eaa-f027e97ec537 --- diff --git a/bertos/cpu/detect.h b/bertos/cpu/detect.h index e64679ba..1ece26e5 100644 --- a/bertos/cpu/detect.h +++ b/bertos/cpu/detect.h @@ -219,12 +219,36 @@ #define CPU_CM3_AT91SAM3N4 1 #define CPU_NAME "AT91SAM3N4" - #define CPU_CM3_AT91SAM3N2 0 - #define CPU_CM3_AT91SAM3N1 0 + #define CPU_CM3_AT91SAM3S 0 + #define CPU_CM3_AT91SAM3U 0 #else #define CPU_CM3_AT91SAM3N4 0 #endif + #if defined (__ARM_AT91SAM3S4__) + #define CPU_CM3_AT91SAM3 1 + #define CPU_CM3_AT91SAM3S 1 + #define CPU_CM3_AT91SAM3S4 1 + #define CPU_NAME "AT91SAM3S4" + + #define CPU_CM3_AT91SAM3N 0 + #define CPU_CM3_AT91SAM3U 0 + #else + #define CPU_CM3_AT91SAM3S4 0 + #endif + + #if defined (__ARM_AT91SAM3U4__) + #define CPU_CM3_AT91SAM3 1 + #define CPU_CM3_AT91SAM3U 1 + #define CPU_CM3_AT91SAM3U4 1 + #define CPU_NAME "AT91SAM3U4" + + #define CPU_CM3_AT91SAM3N 0 + #define CPU_CM3_AT91SAM3S 0 + #else + #define CPU_CM3_AT91SAM3U4 0 + #endif + #if defined (CPU_CM3_LM3S) #if CPU_CM3_LM3S1968 + CPU_CM3_LM3S8962 + 0 != 1 #error Luminary Cortex-M3 CPU configuration error @@ -241,7 +265,7 @@ #if CPU_CM3_AT91SAM3N + 0 != 1 #error AT91SAM3 Cortex-M3 CPU configuration error #endif - #if CPU_CM3_AT91SAM3N4 + CPU_CM3_AT91SAM3N2 + CPU_CM3_AT91SAM3N1 + 0 != 1 + #if CPU_CM3_AT91SAM3N4 + CPU_CM3_AT91SAM3S4 + CPU_CM3_AT91SAM3U4 + 0 != 1 #error AT91SAM3 Cortex-M3 CPU configuration error #endif #define CPU_CM3_LM3S 0