From a638b41ed50c5eb815110870ef4612f283aee248 Mon Sep 17 00:00:00 2001 From: batt Date: Thu, 11 Oct 2007 15:06:05 +0000 Subject: [PATCH] Fix CPU_ARM_AT91 redefinition. git-svn-id: https://src.develer.com/svnoss/bertos/trunk@861 38d2e660-2303-0410-9eaa-f027e97ec537 --- cpu/detect.h | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) 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 -- 2.25.1