sam3: add sam3 generic tag to SAM3X8 cpu info, to allow eth driver build.

[bertos.git] / bertos / cpu / detect.h

diff --git a/bertos/cpu/detect.h b/bertos/cpu/detect.h
index ce462b2ea4b441f1b770a7c9a034cfac5450422b..43628acab6c616f1e746b9b55c907a24e898bad1 100644 (file)
--- a/bertos/cpu/detect.h
+++ b/bertos/cpu/detect.h
@@ -221,6 +221,15 @@
                #define CPU_CM3_STM32F103RB 0
        #endif
 
+       #if defined (__ARM_STM32F103RE__)
+               #define CPU_CM3_STM32       1
+               #define CPU_CM3_STM32F103RE 1
+               #define CPU_NAME            "STM32F103RE"
+       #else
+               #define CPU_CM3_STM32F103RE 0
+       #endif
+
+
        #if defined (__ARM_SAM3N4__)
                #define CPU_CM3_SAM3    1
                #define CPU_CM3_SAM3N   1
@@ -231,6 +240,7 @@
                #define CPU_CM3_SAM3U   0
                #define CPU_CM3_SAM3N2  0
                #define CPU_CM3_SAM3N1  0
+               #define CPU_CM3_SAM3X   0
        #else
                #define CPU_CM3_SAM3N4  0
        #endif
@@ -243,6 +253,7 @@
 
                #define CPU_CM3_SAM3N   0
                #define CPU_CM3_SAM3U   0
+               #define CPU_CM3_SAM3X   0
        #else
                #define CPU_CM3_SAM3S4  0
        #endif
@@ -255,10 +266,24 @@
 
                #define CPU_CM3_SAM3N   0
                #define CPU_CM3_SAM3S   0
+               #define CPU_CM3_SAM3X   0
        #else
                #define CPU_CM3_SAM3U4  0
        #endif
 
+       #if defined (__ARM_SAM3X8__)
+               #define CPU_CM3_SAM3    1
+               #define CPU_CM3_SAM3X   1
+               #define CPU_CM3_SAM3X8  1
+               #define CPU_NAME        "SAM3X8"
+
+               #define CPU_CM3_SAM3N   0
+               #define CPU_CM3_SAM3S   0
+               #define CPU_CM3_SAM3U   0
+       #else
+               #define CPU_CM3_SAM3X8  0
+       #endif
+
        #if defined (CPU_CM3_LM3S)
                #if CPU_CM3_LM3S1968 + CPU_CM3_LM3S8962 + 0 != 1
                        #error Luminary Cortex-M3 CPU configuration error
@@ -266,16 +291,16 @@
                #define CPU_CM3_STM32       0
                #define CPU_CM3_SAM3        0
        #elif defined (CPU_CM3_STM32)
-               #if CPU_CM3_STM32F101C4 + CPU_CM3_STM32F103RB + 0 != 1
+               #if CPU_CM3_STM32F101C4 + CPU_CM3_STM32F103RB + CPU_CM3_STM32F103RE + 0 != 1
                        #error STM32 Cortex-M3 CPU configuration error
                #endif
                #define CPU_CM3_LM3S        0
                #define CPU_CM3_SAM3        0
        #elif defined (CPU_CM3_SAM3)
-               #if CPU_CM3_SAM3N + 0 != 1
+               #if CPU_CM3_SAM3N + CPU_CM3_SAM3U + CPU_CM3_SAM3S + CPU_CM3_SAM3X + 0 != 1
                        #error SAM3 Cortex-M3 CPU configuration error
                #endif
-               #if CPU_CM3_SAM3N4 + CPU_CM3_SAM3S4 + CPU_CM3_SAM3U4 + 0 != 1
+               #if CPU_CM3_SAM3N4 + CPU_CM3_SAM3S4 + CPU_CM3_SAM3U4 + CPU_CM3_SAM3X8 + 0 != 1
                        #error SAM3 Cortex-M3 CPU configuration error
                #endif
                #define CPU_CM3_LM3S        0
@@ -301,10 +326,13 @@
        #define CPU_CM3_STM32 0
        #define CPU_CM3_STM32F103RB 0
        #define CPU_CM3_STM32F101C4 0
+        #define CPU_CM3_STM32F103RE 0
 
        #define CPU_CM3_SAM3 0
        #define CPU_CM3_SAM3N 0
        #define CPU_CM3_SAM3N4 0
+       #define CPU_CM3_SAM3X 0
+       #define CPU_CM3_SAM3X8 0
 #endif
 
 #if (defined(__IAR_SYSTEMS_ICC__) || defined(__IAR_SYSTEMS_ICC)) \
@@ -432,9 +460,16 @@
                #define CPU_AVR_ATMEGA1280  0
        #endif
 
+       #if defined(__AVR_ATmega2560__)
+               #define CPU_AVR_ATMEGA2560  1
+               #define CPU_NAME            "ATmega2560"
+       #else
+               #define CPU_AVR_ATMEGA2560  0
+       #endif
+
        #if CPU_AVR_ATMEGA32 + CPU_AVR_ATMEGA64 + CPU_AVR_ATMEGA103 + CPU_AVR_ATMEGA128 \
          + CPU_AVR_ATMEGA8 + CPU_AVR_ATMEGA168 + CPU_AVR_ATMEGA328P + CPU_AVR_ATMEGA1281 \
-         + CPU_AVR_ATMEGA1280 != 1
+         + CPU_AVR_ATMEGA1280 + CPU_AVR_ATMEGA2560 != 1
                #error AVR CPU configuration error
        #endif
 #else
@@ -448,6 +483,7 @@
        #define CPU_AVR_ATMEGA128       0
        #define CPU_AVR_ATMEGA1281      0
        #define CPU_AVR_ATMEGA1280      0
+       #define CPU_AVR_ATMEGA2560      0
 #endif
 
 #if defined (__MSP430__)