diff options
Diffstat (limited to 'os/common')
8 files changed, 8 insertions, 76 deletions
diff --git a/os/common/ports/ARMCMx/devices/K20x/cmparams.h b/os/common/ports/ARMCMx/devices/K20x/cmparams.h index 98b0ecd19..e539dc740 100644 --- a/os/common/ports/ARMCMx/devices/K20x/cmparams.h +++ b/os/common/ports/ARMCMx/devices/K20x/cmparams.h @@ -42,11 +42,6 @@ #define CORTEX_HAS_ST TRUE
/**
- * @brief Memory Protection unit presence.
- */
-#define CORTEX_HAS_MPU FALSE
-
-/**
* @brief Floating Point unit presence.
*/
#define CORTEX_HAS_FPU FALSE
@@ -72,10 +67,6 @@ assembler source files. We verify that the info matches instead.*/
#include "mk20d5.h"
-#if !CORTEX_HAS_MPU != !__MPU_PRESENT
-#error "CMSIS __MPU_PRESENT 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 28918193f..db2a0e7fc 100644 --- a/os/common/ports/ARMCMx/devices/KL2x/cmparams.h +++ b/os/common/ports/ARMCMx/devices/KL2x/cmparams.h @@ -42,11 +42,6 @@ #define CORTEX_HAS_ST TRUE
/**
- * @brief Memory Protection unit presence.
- */
-#define CORTEX_HAS_MPU FALSE
-
-/**
* @brief Floating Point unit presence.
*/
#define CORTEX_HAS_FPU FALSE
@@ -72,10 +67,6 @@ assembler source files. We verify that the info matches instead.*/
#include "kl25z.h"
-#if !CORTEX_HAS_MPU != !__MPU_PRESENT
-#error "CMSIS __MPU_PRESENT 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 db2e23e6c..ccdbb20e2 100644 --- a/os/common/ports/ARMCMx/devices/STM32F0xx/cmparams.h +++ b/os/common/ports/ARMCMx/devices/STM32F0xx/cmparams.h @@ -38,11 +38,6 @@ #define CORTEX_MODEL CORTEX_M0
/**
- * @brief Memory Protection unit presence.
- */
-#define CORTEX_HAS_MPU 0
-
-/**
* @brief Floating Point unit presence.
*/
#define CORTEX_HAS_FPU 0
@@ -75,10 +70,6 @@ assembler source files. We verify that the info matches instead.*/
#include "stm32f0xx.h"
-#if !CORTEX_HAS_MPU != !__MPU_PRESENT
-#error "CMSIS __MPU_PRESENT 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 fa9c51542..05c2ba31e 100644 --- a/os/common/ports/ARMCMx/devices/STM32F1xx/cmparams.h +++ b/os/common/ports/ARMCMx/devices/STM32F1xx/cmparams.h @@ -38,11 +38,6 @@ #define CORTEX_MODEL CORTEX_M3
/**
- * @brief Memory Protection unit presence.
- */
-#define CORTEX_HAS_MPU 0
-
-/**
* @brief Floating Point unit presence.
*/
#define CORTEX_HAS_FPU 0
@@ -78,10 +73,6 @@ assembler source files. We verify that the info matches instead.*/
#include "stm32f10x.h"
-#if !CORTEX_HAS_MPU != !__MPU_PRESENT
-#error "CMSIS __MPU_PRESENT mismatch"
-#endif
-
#if !CORTEX_HAS_FPU != !__FPU_PRESENT
#error "CMSIS __FPU_PRESENT mismatch"
#endif
diff --git a/os/common/ports/ARMCMx/devices/STM32F30x/cmparams.h b/os/common/ports/ARMCMx/devices/STM32F30x/cmparams.h index 5f2cb7e12..18d45ddba 100644 --- a/os/common/ports/ARMCMx/devices/STM32F30x/cmparams.h +++ b/os/common/ports/ARMCMx/devices/STM32F30x/cmparams.h @@ -38,11 +38,6 @@ #define CORTEX_MODEL CORTEX_M4
/**
- * @brief Memory Protection unit presence.
- */
-#define CORTEX_HAS_MPU 1
-
-/**
* @brief Floating Point unit presence.
*/
#define CORTEX_HAS_FPU 1
@@ -66,18 +61,18 @@ /* If the device type is not externally defined, for example from the Makefile,
then a file named board.h is included. This file must contain a device
definition compatible with the vendor include file.*/
-#if !defined (STM32F30X)
+#if !defined (STM32F301x8) && !defined (STM32F318xx) && \
+ !defined (STM32F302x8) && !defined (STM32F302xC) && \
+ !defined (STM32F303x8) && !defined (STM32F303xC) && \
+ !defined (STM32F358xx) && !defined (STM32F334x8) && \
+ !defined (STM32F328xx)
#include "board.h"
#endif
/* Including the device CMSIS header. Note, we are not using the definitions
from this header because we need this file to be usable also from
assembler source files. We verify that the info matches instead.*/
-#include "stm32f30x.h"
-
-#if !CORTEX_HAS_MPU != !__MPU_PRESENT
-#error "CMSIS __MPU_PRESENT mismatch"
-#endif
+#include "stm32f3xx.h"
#if !CORTEX_HAS_FPU != !__FPU_PRESENT
#error "CMSIS __FPU_PRESENT mismatch"
diff --git a/os/common/ports/ARMCMx/devices/STM32F37x/cmparams.h b/os/common/ports/ARMCMx/devices/STM32F37x/cmparams.h index ad217a271..10517bb4c 100644 --- a/os/common/ports/ARMCMx/devices/STM32F37x/cmparams.h +++ b/os/common/ports/ARMCMx/devices/STM32F37x/cmparams.h @@ -38,11 +38,6 @@ #define CORTEX_MODEL CORTEX_M4
/**
- * @brief Memory Protection unit presence.
- */
-#define CORTEX_HAS_MPU 1
-
-/**
* @brief Floating Point unit presence.
*/
#define CORTEX_HAS_FPU 1
@@ -66,18 +61,14 @@ /* If the device type is not externally defined, for example from the Makefile,
then a file named board.h is included. This file must contain a device
definition compatible with the vendor include file.*/
-#if !defined (STM32F37X)
+#if !defined (STM32F373xC)
#include "board.h"
#endif
/* Including the device CMSIS header. Note, we are not using the definitions
from this header because we need this file to be usable also from
assembler source files. We verify that the info matches instead.*/
-#include "stm32f37x.h"
-
-#if !CORTEX_HAS_MPU != !__MPU_PRESENT
-#error "CMSIS __MPU_PRESENT mismatch"
-#endif
+#include "stm32f3xx.h"
#if !CORTEX_HAS_FPU != !__FPU_PRESENT
#error "CMSIS __FPU_PRESENT mismatch"
diff --git a/os/common/ports/ARMCMx/devices/STM32F4xx/cmparams.h b/os/common/ports/ARMCMx/devices/STM32F4xx/cmparams.h index ae176a655..12a286734 100644 --- a/os/common/ports/ARMCMx/devices/STM32F4xx/cmparams.h +++ b/os/common/ports/ARMCMx/devices/STM32F4xx/cmparams.h @@ -38,11 +38,6 @@ #define CORTEX_MODEL CORTEX_M4
/**
- * @brief Memory Protection unit presence.
- */
-#define CORTEX_HAS_MPU 1
-
-/**
* @brief Floating Point unit presence.
*/
#define CORTEX_HAS_FPU 1
@@ -80,10 +75,6 @@ assembler source files. We verify that the info matches instead.*/
#include "stm32f4xx.h"
-#if !CORTEX_HAS_MPU != !__MPU_PRESENT
-#error "CMSIS __MPU_PRESENT mismatch"
-#endif
-
#if !CORTEX_HAS_FPU != !__FPU_PRESENT
#error "CMSIS __FPU_PRESENT mismatch"
#endif
diff --git a/os/common/ports/ARMCMx/devices/STM32L1xx/cmparams.h b/os/common/ports/ARMCMx/devices/STM32L1xx/cmparams.h index 837690da0..5374d3818 100644 --- a/os/common/ports/ARMCMx/devices/STM32L1xx/cmparams.h +++ b/os/common/ports/ARMCMx/devices/STM32L1xx/cmparams.h @@ -38,11 +38,6 @@ #define CORTEX_MODEL CORTEX_M3
/**
- * @brief Memory Protection unit presence.
- */
-#define CORTEX_HAS_MPU 1
-
-/**
* @brief Floating Point unit presence.
*/
#define CORTEX_HAS_FPU 0
@@ -75,10 +70,6 @@ assembler source files. We verify that the info matches instead.*/
#include "stm32l1xx.h"
-#if !CORTEX_HAS_MPU != !__MPU_PRESENT
-#error "CMSIS __MPU_PRESENT mismatch"
-#endif
-
#if !CORTEX_HAS_FPU != !__FPU_PRESENT
#error "CMSIS __FPU_PRESENT mismatch"
#endif
|