Skip to content

Commit 513bfe3

Browse files
fpistmfpistm
committed
[F2] Update STM32F2xx CMSIS Drivers to v2.2.4
Included in STM32CubeF2 FW v1.9.1 Signed-off-by: Frederic Pillon <[email protected]>
1 parent 6ad352d commit 513bfe3

File tree

8 files changed

+65
-54
lines changed

8 files changed

+65
-54
lines changed

‎system/Drivers/CMSIS/Device/ST/STM32F2xx/Include/stm32f205xx.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13446,9 +13446,6 @@ USB_OTG_HostChannelTypeDef;
1344613446
((INSTANCE) == TIM9) || \
1344713447
((INSTANCE) == TIM12))
1344813448

13449-
/****************** TIM Instances : supporting synchronization ****************/
13450-
#define IS_TIM_SYNCHRO_INSTANCE(INSTANCE) IS_TIM_MASTER_INSTANCE(INSTANCE)
13451-
1345213449
/********************** TIM Instances : 32 bit Counter ************************/
1345313450
#define IS_TIM_32B_COUNTER_INSTANCE(INSTANCE)(((INSTANCE) == TIM2) || \
1345413451
((INSTANCE) == TIM5))

‎system/Drivers/CMSIS/Device/ST/STM32F2xx/Include/stm32f207xx.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14737,9 +14737,6 @@ USB_OTG_HostChannelTypeDef;
1473714737
((INSTANCE) == TIM9) || \
1473814738
((INSTANCE) == TIM12))
1473914739

14740-
/****************** TIM Instances : supporting synchronization ****************/
14741-
#define IS_TIM_SYNCHRO_INSTANCE(INSTANCE) IS_TIM_MASTER_INSTANCE(INSTANCE)
14742-
1474314740
/********************** TIM Instances : 32 bit Counter ************************/
1474414741
#define IS_TIM_32B_COUNTER_INSTANCE(INSTANCE)(((INSTANCE) == TIM2) || \
1474514742
((INSTANCE) == TIM5))

‎system/Drivers/CMSIS/Device/ST/STM32F2xx/Include/stm32f215xx.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13701,9 +13701,6 @@ USB_OTG_HostChannelTypeDef;
1370113701
((INSTANCE) == TIM9) || \
1370213702
((INSTANCE) == TIM12))
1370313703

13704-
/****************** TIM Instances : supporting synchronization ****************/
13705-
#define IS_TIM_SYNCHRO_INSTANCE(INSTANCE) IS_TIM_MASTER_INSTANCE(INSTANCE)
13706-
1370713704
/********************** TIM Instances : 32 bit Counter ************************/
1370813705
#define IS_TIM_32B_COUNTER_INSTANCE(INSTANCE)(((INSTANCE) == TIM2) || \
1370913706
((INSTANCE) == TIM5))

‎system/Drivers/CMSIS/Device/ST/STM32F2xx/Include/stm32f217xx.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14992,9 +14992,6 @@ USB_OTG_HostChannelTypeDef;
1499214992
((INSTANCE) == TIM9) || \
1499314993
((INSTANCE) == TIM12))
1499414994

14995-
/****************** TIM Instances : supporting synchronization ****************/
14996-
#define IS_TIM_SYNCHRO_INSTANCE(INSTANCE) IS_TIM_MASTER_INSTANCE(INSTANCE)
14997-
1499814995
/********************** TIM Instances : 32 bit Counter ************************/
1499914996
#define IS_TIM_32B_COUNTER_INSTANCE(INSTANCE)(((INSTANCE) == TIM2) || \
1500014997
((INSTANCE) == TIM5))

‎system/Drivers/CMSIS/Device/ST/STM32F2xx/Include/stm32f2xx.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,11 +81,11 @@
8181
#endif /* USE_HAL_DRIVER */
8282

8383
/**
84-
* @brief CMSIS Device version number V2.2.3
84+
* @brief CMSIS Device version number V2.2.4
8585
*/
8686
#define __STM32F2xx_CMSIS_VERSION_MAIN (0x02U) /*!< [31:24] main version */
8787
#define __STM32F2xx_CMSIS_VERSION_SUB1 (0x02U) /*!< [23:16] sub1 version */
88-
#define __STM32F2xx_CMSIS_VERSION_SUB2 (0x03U) /*!< [15:8] sub2 version */
88+
#define __STM32F2xx_CMSIS_VERSION_SUB2 (0x04U) /*!< [15:8] sub2 version */
8989
#define __STM32F2xx_CMSIS_VERSION_RC (0x00U) /*!< [7:0] release candidate */
9090
#define __STM32F2xx_CMSIS_VERSION ((__STM32F2xx_CMSIS_VERSION_MAIN << 24)\
9191
|(__STM32F2xx_CMSIS_VERSION_SUB1 << 16)\

‎system/Drivers/CMSIS/Device/ST/STM32F2xx/Release_Notes.html

Lines changed: 35 additions & 10 deletions
Large diffs are not rendered by default.

‎system/Drivers/CMSIS/Device/ST/STM32F2xx/Source/Templates/system_stm32f2xx.c

Lines changed: 27 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,30 @@
7474
on STM322xG_EVAL board as data memory */
7575
/* #define DATA_IN_ExtSRAM */
7676

77-
/*!< Uncomment the following line if you need to relocate your vector Table in
78-
Internal SRAM. */
77+
/* Note: Following vector table addresses must be defined in line with linker
78+
configuration. */
79+
/*!< Uncomment the following line if you need to relocate the vector table
80+
anywhere in Flash or Sram, else the vector table is kept at the automatic
81+
remap of boot address selected */
82+
/* #define USER_VECT_TAB_ADDRESS */
83+
84+
#if defined(USER_VECT_TAB_ADDRESS)
85+
/*!< Uncomment the following line if you need to relocate your vector Table
86+
in Sram else user remap will be done in Flash. */
7987
/* #define VECT_TAB_SRAM */
80-
#define VECT_TAB_OFFSET 0x00 /*!< Vector Table base offset field.
81-
This value must be a multiple of 0x200. */
88+
#if defined(VECT_TAB_SRAM)
89+
#define VECT_TAB_BASE_ADDRESS SRAM_BASE /*!< Vector Table base address field.
90+
This value must be a multiple of 0x200. */
91+
#define VECT_TAB_OFFSET 0x00000000U /*!< Vector Table base offset field.
92+
This value must be a multiple of 0x200. */
93+
#else
94+
#define VECT_TAB_BASE_ADDRESS FLASH_BASE /*!< Vector Table base address field.
95+
This value must be a multiple of 0x200. */
96+
#define VECT_TAB_OFFSET 0x00000000U /*!< Vector Table base offset field.
97+
This value must be a multiple of 0x200. */
98+
#endif /* VECT_TAB_SRAM */
99+
#endif /* USER_VECT_TAB_ADDRESS */
100+
82101
/******************************************************************************/
83102

84103
/**
@@ -137,35 +156,14 @@
137156
*/
138157
void SystemInit(void)
139158
{
140-
/* Reset the RCC clock configuration to the default reset state ------------*/
141-
/* Set HSION bit */
142-
RCC->CR |= (uint32_t)0x00000001;
143-
144-
/* Reset CFGR register */
145-
RCC->CFGR = 0x00000000;
146-
147-
/* Reset HSEON, CSSON and PLLON bits */
148-
RCC->CR &= (uint32_t)0xFEF6FFFF;
149-
150-
/* Reset PLLCFGR register */
151-
RCC->PLLCFGR = 0x24003010;
152-
153-
/* Reset HSEBYP bit */
154-
RCC->CR &= (uint32_t)0xFFFBFFFF;
155-
156-
/* Disable all interrupts */
157-
RCC->CIR = 0x00000000;
158-
159159
#ifdef DATA_IN_ExtSRAM
160160
SystemInit_ExtMemCtl();
161161
#endif /* DATA_IN_ExtSRAM */
162162

163-
/* Configure the Vector Table location add offset address ------------------*/
164-
#ifdef VECT_TAB_SRAM
165-
SCB->VTOR = SRAM_BASE | VECT_TAB_OFFSET; /* Vector Table Relocation in Internal SRAM */
166-
#else
167-
SCB->VTOR = FLASH_BASE | VECT_TAB_OFFSET; /* Vector Table Relocation in Internal FLASH */
168-
#endif
163+
/* Configure the Vector Table location -------------------------------------*/
164+
#if defined(USER_VECT_TAB_ADDRESS)
165+
SCB->VTOR = VECT_TAB_BASE_ADDRESS | VECT_TAB_OFFSET; /* Vector Table Relocation in Internal SRAM */
166+
#endif /* USER_VECT_TAB_ADDRESS */
169167
}
170168

171169
/**

‎system/Drivers/CMSIS/Device/ST/STM32YYxx_CMSIS_version.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
* STM32F0: 2.3.4
44
* STM32F1: 4.3.2
5-
* STM32F2: 2.2.3
5+
* STM32F2: 2.2.4
66
* STM32F3: 2.3.4
77
* STM32F4: 2.6.5
88
* STM32F7: 1.2.5

0 commit comments

Comments
 (0)