From a3e2fd30898b3890a53a505103b5e2535fc34533 Mon Sep 17 00:00:00 2001 From: Giovanni Di Sirio Date: Thu, 26 Mar 2015 11:12:55 +0000 Subject: git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7810 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- os/common/ports/ARMCMx/devices/K20x/cmparams.h | 6 +++++- os/common/ports/ARMCMx/devices/KL2x/cmparams.h | 6 +++++- os/common/ports/ARMCMx/devices/STM32F0xx/cmparams.h | 6 +++++- os/common/ports/ARMCMx/devices/STM32F1xx/cmparams.h | 6 +++--- os/common/ports/ARMCMx/devices/STM32F3xx/cmparams.h | 6 +++++- os/common/ports/ARMCMx/devices/STM32F4xx/cmparams.h | 6 +++++- os/common/ports/ARMCMx/devices/STM32L0xx/cmparams.h | 6 +++++- os/common/ports/ARMCMx/devices/STM32L1xx/cmparams.h | 6 +++--- 8 files changed, 36 insertions(+), 12 deletions(-) (limited to 'os/common/ports/ARMCMx') diff --git a/os/common/ports/ARMCMx/devices/K20x/cmparams.h b/os/common/ports/ARMCMx/devices/K20x/cmparams.h index ae4b5843b..5ae9dada6 100644 --- a/os/common/ports/ARMCMx/devices/K20x/cmparams.h +++ b/os/common/ports/ARMCMx/devices/K20x/cmparams.h @@ -34,7 +34,7 @@ /** * @brief Cortex core model. */ -#define CORTEX_MODEL CORTEX_M4 +#define CORTEX_MODEL 4 /** * @brief Systick unit presence. @@ -67,6 +67,10 @@ assembler source files. We verify that the info matches instead.*/ #include "mk20d5.h" +#if CORTEX_MODEL != __CORTEX_M +#error "CMSIS __CORTEX_M mismatch" +#endif + #if CORTEX_PRIORITY_BITS != __NVIC_PRIO_BITS #error "CMSIS __NVIC_PRIO_BITS mismatch" #endif diff --git a/os/common/ports/ARMCMx/devices/KL2x/cmparams.h b/os/common/ports/ARMCMx/devices/KL2x/cmparams.h index f1a5b36ef..6da2fed0e 100644 --- a/os/common/ports/ARMCMx/devices/KL2x/cmparams.h +++ b/os/common/ports/ARMCMx/devices/KL2x/cmparams.h @@ -34,7 +34,7 @@ /** * @brief Cortex core model. */ -#define CORTEX_MODEL CORTEX_M0PLUS +#define CORTEX_MODEL 0 /** * @brief Systick unit presence. @@ -67,6 +67,10 @@ assembler source files. We verify that the info matches instead.*/ #include "kl25z.h" +#if CORTEX_MODEL != __CORTEX_M +#error "CMSIS __CORTEX_M mismatch" +#endif + #if CORTEX_PRIORITY_BITS != __NVIC_PRIO_BITS #error "CMSIS __NVIC_PRIO_BITS mismatch" #endif diff --git a/os/common/ports/ARMCMx/devices/STM32F0xx/cmparams.h b/os/common/ports/ARMCMx/devices/STM32F0xx/cmparams.h index 8e44e2029..2744a6f72 100644 --- a/os/common/ports/ARMCMx/devices/STM32F0xx/cmparams.h +++ b/os/common/ports/ARMCMx/devices/STM32F0xx/cmparams.h @@ -34,7 +34,7 @@ /** * @brief Cortex core model. */ -#define CORTEX_MODEL CORTEX_M0 +#define CORTEX_MODEL 0 /** * @brief Floating Point unit presence. @@ -74,6 +74,10 @@ assembler source files. We verify that the info matches instead.*/ #include "stm32f0xx.h" +#if CORTEX_MODEL != __CORTEX_M +#error "CMSIS __CORTEX_M mismatch" +#endif + #if CORTEX_PRIORITY_BITS != __NVIC_PRIO_BITS #error "CMSIS __NVIC_PRIO_BITS mismatch" #endif diff --git a/os/common/ports/ARMCMx/devices/STM32F1xx/cmparams.h b/os/common/ports/ARMCMx/devices/STM32F1xx/cmparams.h index 30d81bcc9..9f91938ff 100644 --- a/os/common/ports/ARMCMx/devices/STM32F1xx/cmparams.h +++ b/os/common/ports/ARMCMx/devices/STM32F1xx/cmparams.h @@ -34,7 +34,7 @@ /** * @brief Cortex core model. */ -#define CORTEX_MODEL CORTEX_M3 +#define CORTEX_MODEL 3 /** * @brief Floating Point unit presence. @@ -65,8 +65,8 @@ assembler source files. We verify that the info matches instead.*/ #include "stm32f10x.h" -#if !CORTEX_HAS_FPU != !__FPU_PRESENT -#error "CMSIS __FPU_PRESENT mismatch" +#if CORTEX_MODEL != __CORTEX_M +#error "CMSIS __CORTEX_M mismatch" #endif #if CORTEX_PRIORITY_BITS != __NVIC_PRIO_BITS diff --git a/os/common/ports/ARMCMx/devices/STM32F3xx/cmparams.h b/os/common/ports/ARMCMx/devices/STM32F3xx/cmparams.h index 12f2b31f4..bcf0c6f32 100644 --- a/os/common/ports/ARMCMx/devices/STM32F3xx/cmparams.h +++ b/os/common/ports/ARMCMx/devices/STM32F3xx/cmparams.h @@ -34,7 +34,7 @@ /** * @brief Cortex core model. */ -#define CORTEX_MODEL CORTEX_M4 +#define CORTEX_MODEL 4 /** * @brief Floating Point unit presence. @@ -74,6 +74,10 @@ assembler source files. We verify that the info matches instead.*/ #include "stm32f3xx.h" +#if CORTEX_MODEL != __CORTEX_M +#error "CMSIS __CORTEX_M mismatch" +#endif + #if CORTEX_HAS_FPU != __FPU_PRESENT #error "CMSIS __FPU_PRESENT mismatch" #endif diff --git a/os/common/ports/ARMCMx/devices/STM32F4xx/cmparams.h b/os/common/ports/ARMCMx/devices/STM32F4xx/cmparams.h index 0f8b090b7..59951b5ae 100644 --- a/os/common/ports/ARMCMx/devices/STM32F4xx/cmparams.h +++ b/os/common/ports/ARMCMx/devices/STM32F4xx/cmparams.h @@ -34,7 +34,7 @@ /** * @brief Cortex core model. */ -#define CORTEX_MODEL CORTEX_M4 +#define CORTEX_MODEL 4 /** * @brief Floating Point unit presence. @@ -74,6 +74,10 @@ assembler source files. We verify that the info matches instead.*/ #include "stm32f4xx.h" +#if CORTEX_MODEL != __CORTEX_M +#error "CMSIS __CORTEX_M mismatch" +#endif + #if CORTEX_HAS_FPU != __FPU_PRESENT #error "CMSIS __FPU_PRESENT mismatch" #endif diff --git a/os/common/ports/ARMCMx/devices/STM32L0xx/cmparams.h b/os/common/ports/ARMCMx/devices/STM32L0xx/cmparams.h index 2d227d1ef..850793a0f 100644 --- a/os/common/ports/ARMCMx/devices/STM32L0xx/cmparams.h +++ b/os/common/ports/ARMCMx/devices/STM32L0xx/cmparams.h @@ -34,7 +34,7 @@ /** * @brief Cortex core model. */ -#define CORTEX_MODEL CORTEX_M0PLUS +#define CORTEX_MODEL 0 /** * @brief Floating Point unit presence. @@ -71,6 +71,10 @@ assembler source files. We verify that the info matches instead.*/ #include "stm32l0xx.h" +#if CORTEX_MODEL != __CORTEX_M +#error "CMSIS __CORTEX_M mismatch" +#endif + #if CORTEX_PRIORITY_BITS != __NVIC_PRIO_BITS #error "CMSIS __NVIC_PRIO_BITS mismatch" #endif diff --git a/os/common/ports/ARMCMx/devices/STM32L1xx/cmparams.h b/os/common/ports/ARMCMx/devices/STM32L1xx/cmparams.h index 2e3062f4a..2c52fef39 100644 --- a/os/common/ports/ARMCMx/devices/STM32L1xx/cmparams.h +++ b/os/common/ports/ARMCMx/devices/STM32L1xx/cmparams.h @@ -34,7 +34,7 @@ /** * @brief Cortex core model. */ -#define CORTEX_MODEL CORTEX_M3 +#define CORTEX_MODEL 3 /** * @brief Floating Point unit presence. @@ -69,8 +69,8 @@ assembler source files. We verify that the info matches instead.*/ #include "stm32l1xx.h" -#if !CORTEX_HAS_FPU != !__FPU_PRESENT -#error "CMSIS __FPU_PRESENT mismatch" +#if CORTEX_MODEL != __CORTEX_M +#error "CMSIS __CORTEX_M mismatch" #endif #if CORTEX_PRIORITY_BITS != __NVIC_PRIO_BITS -- cgit v1.2.3