From 2acabf55f6ca9d992803b629157b971358fb76f6 Mon Sep 17 00:00:00 2001 From: gdisirio Date: Tue, 1 Oct 2013 12:26:11 +0000 Subject: git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6340 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- os/common/ports/ARMCMx/devices/STM32F0xx/cmparams.h | 7 +++++++ os/common/ports/ARMCMx/devices/STM32F1xx/cmparams.h | 10 ++++++++++ os/common/ports/ARMCMx/devices/STM32F30x/cmparams.h | 7 +++++++ os/common/ports/ARMCMx/devices/STM32F37x/cmparams.h | 7 +++++++ os/common/ports/ARMCMx/devices/STM32F4xx/cmparams.h | 7 +++++++ os/common/ports/ARMCMx/devices/STM32L1xx/cmparams.h | 7 +++++++ 6 files changed, 45 insertions(+) (limited to 'os/common/ports/ARMCMx/devices') diff --git a/os/common/ports/ARMCMx/devices/STM32F0xx/cmparams.h b/os/common/ports/ARMCMx/devices/STM32F0xx/cmparams.h index e0e842e52..608c7a159 100644 --- a/os/common/ports/ARMCMx/devices/STM32F0xx/cmparams.h +++ b/os/common/ports/ARMCMx/devices/STM32F0xx/cmparams.h @@ -63,6 +63,13 @@ asm module.*/ #if !defined(_FROM_ASM_) +/* 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(STM32F0XX_LD) && !defined(STM32F0XX_MD) +#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.*/ diff --git a/os/common/ports/ARMCMx/devices/STM32F1xx/cmparams.h b/os/common/ports/ARMCMx/devices/STM32F1xx/cmparams.h index f3b0be7f9..282f26602 100644 --- a/os/common/ports/ARMCMx/devices/STM32F1xx/cmparams.h +++ b/os/common/ports/ARMCMx/devices/STM32F1xx/cmparams.h @@ -63,6 +63,16 @@ asm module.*/ #if !defined(_FROM_ASM_) +/* 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(STM32F10X_LD) && !defined(STM32F10X_LD_VL) && \ + !defined(STM32F10X_MD) && !defined(STM32F10X_MD_VL) && \ + !defined(STM32F10X_HD) && !defined(STM32F10X_HD_VL) && \ + !defined(STM32F10X_XL) && !defined(STM32F10X_CL) +#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.*/ diff --git a/os/common/ports/ARMCMx/devices/STM32F30x/cmparams.h b/os/common/ports/ARMCMx/devices/STM32F30x/cmparams.h index 28bc40724..28e8051c6 100644 --- a/os/common/ports/ARMCMx/devices/STM32F30x/cmparams.h +++ b/os/common/ports/ARMCMx/devices/STM32F30x/cmparams.h @@ -63,6 +63,13 @@ asm module.*/ #if !defined(_FROM_ASM_) +/* 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) +#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.*/ diff --git a/os/common/ports/ARMCMx/devices/STM32F37x/cmparams.h b/os/common/ports/ARMCMx/devices/STM32F37x/cmparams.h index 45a7d1594..274e54193 100644 --- a/os/common/ports/ARMCMx/devices/STM32F37x/cmparams.h +++ b/os/common/ports/ARMCMx/devices/STM32F37x/cmparams.h @@ -63,6 +63,13 @@ asm module.*/ #if !defined(_FROM_ASM_) +/* 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) +#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.*/ diff --git a/os/common/ports/ARMCMx/devices/STM32F4xx/cmparams.h b/os/common/ports/ARMCMx/devices/STM32F4xx/cmparams.h index 3bb79e75f..43277ee96 100644 --- a/os/common/ports/ARMCMx/devices/STM32F4xx/cmparams.h +++ b/os/common/ports/ARMCMx/devices/STM32F4xx/cmparams.h @@ -63,6 +63,13 @@ asm module.*/ #if !defined(_FROM_ASM_) +/* 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(STM32F40XX) && !defined(STM32F427X) +#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.*/ diff --git a/os/common/ports/ARMCMx/devices/STM32L1xx/cmparams.h b/os/common/ports/ARMCMx/devices/STM32L1xx/cmparams.h index 39be9d4fa..76dcb200e 100644 --- a/os/common/ports/ARMCMx/devices/STM32L1xx/cmparams.h +++ b/os/common/ports/ARMCMx/devices/STM32L1xx/cmparams.h @@ -63,6 +63,13 @@ asm module.*/ #if !defined(_FROM_ASM_) +/* 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(STM32L1XX_MD) && !defined(STM32L1XX_MDP) && !defined(STM32L1XX_HD) +#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.*/ -- cgit v1.2.3