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/ext/CMSIS/ST/stm32f0xx.h | 2 +- os/ext/CMSIS/ST/stm32f10x.h | 6 ++++-- os/ext/CMSIS/ST/stm32f30x.h | 2 +- os/ext/CMSIS/ST/stm32f37x.h | 6 ++++-- os/ext/CMSIS/ST/stm32f4xx.h | 6 ++++-- os/ext/CMSIS/ST/stm32l1xx.h | 6 ++++-- 6 files changed, 18 insertions(+), 10 deletions(-) (limited to 'os/ext/CMSIS') diff --git a/os/ext/CMSIS/ST/stm32f0xx.h b/os/ext/CMSIS/ST/stm32f0xx.h index 28ad5a884..09fb548e9 100644 --- a/os/ext/CMSIS/ST/stm32f0xx.h +++ b/os/ext/CMSIS/ST/stm32f0xx.h @@ -67,7 +67,7 @@ #if !defined (STM32F0XX_LD) && !defined (STM32F0XX_MD) /* #define STM32F0XX_LD*/ /*!< STM32F0xx Low-density devices are STM32F050xx and STM32F060xx microcontrollers where the Flash memory ranges between 16 and 32 Kbytes */ - #define STM32F0XX_MD /*!< STM32F0xx Medium-density devices are STM32F051xx and STM32F061xx microcontrollers where the Flash memory ranges between 16 and 64 Kbytes */ + /* #define STM32F0XX_MD*/ /*!< STM32F0xx Medium-density devices are STM32F051xx and STM32F061xx microcontrollers where the Flash memory ranges between 16 and 64 Kbytes */ #endif /* Tip: To avoid modifying this file each time you need to switch between these devices, you can define the device in your toolchain compiler preprocessor. diff --git a/os/ext/CMSIS/ST/stm32f10x.h b/os/ext/CMSIS/ST/stm32f10x.h index df42d3756..f8471f6c6 100644 --- a/os/ext/CMSIS/ST/stm32f10x.h +++ b/os/ext/CMSIS/ST/stm32f10x.h @@ -65,7 +65,7 @@ #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) /* #define STM32F10X_LD */ /*!< STM32F10X_LD: STM32 Low density devices */ /* #define STM32F10X_LD_VL */ /*!< STM32F10X_LD_VL: STM32 Low density Value Line devices */ - #define STM32F10X_MD /*!< STM32F10X_MD: STM32 Medium density devices */ + /* #define STM32F10X_MD */ /*!< STM32F10X_MD: STM32 Medium density devices */ /* #define STM32F10X_MD_VL */ /*!< STM32F10X_MD_VL: STM32 Medium density Value Line devices */ /* #define STM32F10X_HD */ /*!< STM32F10X_HD: STM32 High density devices */ /* #define STM32F10X_HD_VL */ /*!< STM32F10X_HD_VL: STM32 High density value line devices */ @@ -93,7 +93,9 @@ */ #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) - #error "Please select first the target STM32F10x device used in your application (in stm32f10x.h file)" +/* CHIBIOS FIX */ +#include "board.h" +// #error "Please select first the target STM32F10x device used in your application (in stm32f10x.h file)" #endif #if !defined USE_STDPERIPH_DRIVER diff --git a/os/ext/CMSIS/ST/stm32f30x.h b/os/ext/CMSIS/ST/stm32f30x.h index 99c6178ee..1c1f66f79 100644 --- a/os/ext/CMSIS/ST/stm32f30x.h +++ b/os/ext/CMSIS/ST/stm32f30x.h @@ -66,7 +66,7 @@ */ #if !defined (STM32F30X) - #define STM32F30X +/* #define STM32F30X */ #endif /* Tip: To avoid modifying this file each time you need to switch between these diff --git a/os/ext/CMSIS/ST/stm32f37x.h b/os/ext/CMSIS/ST/stm32f37x.h index 08c7f271c..fa281aa7a 100644 --- a/os/ext/CMSIS/ST/stm32f37x.h +++ b/os/ext/CMSIS/ST/stm32f37x.h @@ -63,7 +63,7 @@ */ #if !defined (STM32F37X) - #define STM32F37X +/* #define STM32F37X */ #endif /* Tip: To avoid modifying this file each time you need to switch between these @@ -71,7 +71,9 @@ */ #if !defined (STM32F37X) - #error "Please select first the target STM32F37X device used in your application (in stm32f37x.h file)" +/* CHIBIOS FIX */ +#include "board.h" +// #error "Please select first the target STM32F37X device used in your application (in stm32f37x.h file)" #endif #if !defined (USE_STDPERIPH_DRIVER) diff --git a/os/ext/CMSIS/ST/stm32f4xx.h b/os/ext/CMSIS/ST/stm32f4xx.h index 11f40e8dc..5d35196f3 100644 --- a/os/ext/CMSIS/ST/stm32f4xx.h +++ b/os/ext/CMSIS/ST/stm32f4xx.h @@ -66,7 +66,7 @@ */ #if !defined (STM32F4XX) && !defined (STM32F40XX) && !defined (STM32F427X) - #define STM32F40XX /*!< STM32F40xx/41xx Devices */ + /* #define STM32F40XX */ /*!< STM32F40xx/41xx Devices */ /* #define STM32F427X */ /*!< STM32F427x/437x Devices*/ #endif @@ -76,7 +76,9 @@ */ #if !defined (STM32F4XX) && !defined (STM32F40XX) && !defined (STM32F427X) - #error "Please select first the target STM32F4xx device used in your application (in stm32f4xx.h file)" +/* CHIBIOS FIX */ +#include "board.h" +// #error "Please select first the target STM32F4xx device used in your application (in stm32f4xx.h file)" #endif #if !defined (USE_STDPERIPH_DRIVER) diff --git a/os/ext/CMSIS/ST/stm32l1xx.h b/os/ext/CMSIS/ST/stm32l1xx.h index 116e4378d..da2876851 100644 --- a/os/ext/CMSIS/ST/stm32l1xx.h +++ b/os/ext/CMSIS/ST/stm32l1xx.h @@ -68,7 +68,7 @@ #if !defined (STM32L1XX_MD) && !defined (STM32L1XX_MDP) && !defined (STM32L1XX_HD) - #define STM32L1XX_MD /*!< - Ultra Low Power Medium-density devices: STM32L151x6xx, STM32L151x8xx, +/* #define STM32L1XX_MD */ /*!< - Ultra Low Power Medium-density devices: STM32L151x6xx, STM32L151x8xx, STM32L151xBxx, STM32L152x6xx, STM32L152x8xx and STM32L152xBxx. - Ultra Low Power Medium-density Value Line devices: STM32L100x6xx, STM32L100x8xx and STM32L100xBxx. */ @@ -83,7 +83,9 @@ */ #if !defined (STM32L1XX_MD) && !defined (STM32L1XX_MDP) && !defined (STM32L1XX_HD) - #error "Please select first the target STM32L1xx device used in your application (in stm32l1xx.h file)" +/* CHIBIOS FIX */ +#include "board.h" +// #error "Please select first the target STM32L1xx device used in your application (in stm32l1xx.h file)" #endif #if !defined USE_STDPERIPH_DRIVER -- cgit v1.2.3