New STM32F3xx headers.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7328 35acf78f-673a-0410-8e92-d51de3d6d3f4

1 files changed, 6 insertions, 11 deletions

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"