Skip to content

Commit a2454dc

Browse files
fpistmfpistm
authored
Merge pull request #1139 from fpistm/Update_WB
Update STM32WB HAL and CMSIS drivers
2 parents f41f10e + 2e64639 commit a2454dc

File tree

97 files changed

+4731
-6245
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

97 files changed

+4731
-6245
lines changed

‎libraries/SrcWrapper/src/HAL/stm32yyxx_hal_i2s.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,3 @@
3131
#ifdef STM32L1xx
3232
#include "stm32l1xx_hal_i2s.c"
3333
#endif
34-
#ifdef STM32WBxx
35-
#include "stm32wbxx_hal_i2s.c"
36-
#endif

‎system/Drivers/CMSIS/Device/ST/STM32WBxx/Include/stm32wb30xx.h

Lines changed: 41 additions & 146 deletions
Large diffs are not rendered by default.

‎system/Drivers/CMSIS/Device/ST/STM32WBxx/Include/stm32wb35xx.h

Lines changed: 719 additions & 711 deletions
Large diffs are not rendered by default.

‎system/Drivers/CMSIS/Device/ST/STM32WBxx/Include/stm32wb50xx.h

Lines changed: 37 additions & 131 deletions
Large diffs are not rendered by default.

‎system/Drivers/CMSIS/Device/ST/STM32WBxx/Include/stm32wb55xx.h

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

‎system/Drivers/CMSIS/Device/ST/STM32WBxx/Include/stm32wb5mxx.h

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

‎system/Drivers/CMSIS/Device/ST/STM32WBxx/Include/stm32wbxx.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
* @brief CMSIS Device version number
7070
*/
7171
#define __STM32WBxx_CMSIS_VERSION_MAIN (0x01U) /*!< [31:24] main version */
72-
#define __STM32WBxx_CMSIS_VERSION_SUB1 (0x04U) /*!< [23:16] sub1 version */
72+
#define __STM32WBxx_CMSIS_VERSION_SUB1 (0x06U) /*!< [23:16] sub1 version */
7373
#define __STM32WBxx_CMSIS_VERSION_SUB2 (0x00U) /*!< [15:8] sub2 version */
7474
#define __STM32WBxx_CMSIS_VERSION_RC (0x00U) /*!< [7:0] release candidate */
7575
#define __STM32WBxx_CMSIS_DEVICE_VERSION ((__STM32WBxx_CMSIS_VERSION_MAIN << 24)\

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

Lines changed: 60 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,57 @@ <h2 id="stm32wb35xx-and-stm32wb30xx">STM32WB35xx and STM32WB30xx</h2>
8080
<div class="col-sm-12 col-lg-8">
8181
<h1 id="update-history">Update History</h1>
8282
<div class="collapse">
83-
<input type="checkbox" id="collapse-section5" checked aria-hidden="true"> <label for="collapse-section5" aria-hidden="true">v1.4.0 / 12-February-2020</label>
83+
<input type="checkbox" id="collapse-section6" checked aria-hidden="true"> <label for="collapse-section6" aria-hidden="true">v1.6.0 / 05-June-2020</label>
8484
<div>
8585
<h2 id="main-changes">Main Changes</h2>
86+
<h3 id="maintenance-release">Maintenance release</h3>
87+
<p>Maintenance release for <strong>STM32WBxx</strong> devices (stm32wb55xx, stm32wb50xx, stm32wb35xx and stm32wb30xx devices)</p>
88+
<table>
89+
<thead>
90+
<tr class="header">
91+
<th style="text-align: left;">Fixed bugs headline</th>
92+
</tr>
93+
</thead>
94+
<tbody>
95+
<tr class="odd">
96+
<td style="text-align: left;">[All devices] Correct DMAMUX_CxCR_DMAREQ_ID_Msk</td>
97+
</tr>
98+
<tr class="even">
99+
<td style="text-align: left;">[All devices] Remove DMAMUX_CxCR_DMAREQ_ID_[6-7]</td>
100+
</tr>
101+
<tr class="odd">
102+
<td style="text-align: left;">[All devices] Call SystemInit first in startup/Reset_Handler, so GCC code is similar to IAR/Keil</td>
103+
</tr>
104+
<tr class="even">
105+
<td style="text-align: left;">[STM32WB50xx and STM32WB30xx] Remove OR register from LPTIM_TypeDef</td>
106+
</tr>
107+
<tr class="odd">
108+
<td style="text-align: left;">[STM32WB50xx and STM32WB30xx] Remove DMAMUX_CSR_SOF[7-13] and DMAMUX_CFR_SOF[7-13]</td>
109+
</tr>
110+
<tr class="even">
111+
<td style="text-align: left;">[STM32WB50xx and STM32WB30xx] Remove EXTI_RTSR1_RTxx_Pos [20, 21 and 31]</td>
112+
</tr>
113+
<tr class="odd">
114+
<td style="text-align: left;">[STM32WB50xx and STM32WB30xx] Remove TIM2_OR_TI4_RMP, TIM2_OR_ITR1_RMP and LPTIM_OR_OR</td>
115+
</tr>
116+
</tbody>
117+
</table>
118+
<h2 id="development-toolchains-and-compilers">Development Toolchains and Compilers</h2>
119+
<ul>
120+
<li>IAR Embedded Workbench for ARM (EWARM) toolchain V8.20.2</li>
121+
<li>RealView Microcontroller Development Kit (MDK-ARM) toolchain V5.25</li>
122+
<li>System Workbench STM32 (SW4STM32) toolchain V2.7</li>
123+
</ul>
124+
<h2 id="supported-devices-and-boards">Supported Devices and boards</h2>
125+
<ul>
126+
<li>STM32WB55xx, STM32WB5Mxx, STM32WB50xx, STM32WB35xx and STM32WB30xx devices.</li>
127+
</ul>
128+
</div>
129+
</div>
130+
<div class="collapse">
131+
<input type="checkbox" id="collapse-section5" aria-hidden="true"> <label for="collapse-section5" aria-hidden="true">v1.4.0 / 12-February-2020</label>
132+
<div>
133+
<h2 id="main-changes-1">Main Changes</h2>
86134
<h3 id="introduction-of-stm32wb35xx-stm32wb30xx-and-stm32wb5mxx-product">Introduction of STM32WB35xx, STM32WB30xx and STM32WB5Mxx product</h3>
87135
<p>This release introduce the support of STM32WB5Mxx, STM32WB35xx product and its value line STM32WB30xx.</p>
88136
<p>Added features:</p>
@@ -94,13 +142,13 @@ <h3 id="introduction-of-stm32wb35xx-stm32wb30xx-and-stm32wb5mxx-product">Introdu
94142
<li>The product STM32WB35xx is supported by enabling inside your project the define “STM32WB35xx”.</li>
95143
<li>The product STM32WB30xx is supported by enabling inside your project the define “STM32WB30xx”.</li>
96144
</ul>
97-
<h2 id="development-toolchains-and-compilers">Development Toolchains and Compilers</h2>
145+
<h2 id="development-toolchains-and-compilers-1">Development Toolchains and Compilers</h2>
98146
<ul>
99147
<li>IAR Embedded Workbench for ARM (EWARM) toolchain V8.20.2</li>
100148
<li>RealView Microcontroller Development Kit (MDK-ARM) toolchain V5.25</li>
101149
<li>System Workbench STM32 (SW4STM32) toolchain V2.7</li>
102150
</ul>
103-
<h2 id="supported-devices-and-boards">Supported Devices and boards</h2>
151+
<h2 id="supported-devices-and-boards-1">Supported Devices and boards</h2>
104152
<ul>
105153
<li>STM32WB55xx, STM32WB5Mxx, STM32WB50xx, STM32WB35xx and STM32WB30xx devices.</li>
106154
</ul>
@@ -109,7 +157,7 @@ <h2 id="supported-devices-and-boards">Supported Devices and boards</h2>
109157
<div class="collapse">
110158
<input type="checkbox" id="collapse-section4" aria-hidden="true"> <label for="collapse-section4" aria-hidden="true">v1.3.0 / 11-September-2019</label>
111159
<div>
112-
<h2 id="main-changes-1">Main Changes</h2>
160+
<h2 id="main-changes-2">Main Changes</h2>
113161
<p>Maintenance release for <strong>STM32WBxx</strong> devices (stm32wb55xx and stm32wb50xx devices)</p>
114162
<table>
115163
<thead>
@@ -132,13 +180,13 @@ <h2 id="main-changes-1">Main Changes</h2>
132180
</tr>
133181
</tbody>
134182
</table>
135-
<h2 id="development-toolchains-and-compilers-1">Development Toolchains and Compilers</h2>
183+
<h2 id="development-toolchains-and-compilers-2">Development Toolchains and Compilers</h2>
136184
<ul>
137185
<li>IAR Embedded Workbench for ARM (EWARM) toolchain V8.20.2</li>
138186
<li>RealView Microcontroller Development Kit (MDK-ARM) toolchain V5.25</li>
139187
<li>System Workbench STM32 (SW4STM32) toolchain V2.7</li>
140188
</ul>
141-
<h2 id="supported-devices-and-boards-1">Supported Devices and boards</h2>
189+
<h2 id="supported-devices-and-boards-2">Supported Devices and boards</h2>
142190
<ul>
143191
<li>STM32WB55xx, STM32WB50xx devices</li>
144192
</ul>
@@ -147,18 +195,18 @@ <h2 id="supported-devices-and-boards-1">Supported Devices and boards</h2>
147195
<div class="collapse">
148196
<input type="checkbox" id="collapse-section3" aria-hidden="true"> <label for="collapse-section3" aria-hidden="true">V1.2.0 / 26-June-2019</label>
149197
<div>
150-
<h2 id="main-changes-2">Main Changes</h2>
198+
<h2 id="main-changes-3">Main Changes</h2>
151199
<h3 id="introduction-of-stm32wb50xx-device">Introduction of STM32WB50xx device</h3>
152200
<p>First release for STM32WBxx CMSIS introducing <strong>stm32wb50xx</strong> devices.</p>
153201
<h2 id="contents">Contents</h2>
154202
<p>CMSIS devices files for stm32wb55xx, stm32wb50xx devices.</p>
155-
<h2 id="development-toolchains-and-compilers-2">Development Toolchains and Compilers</h2>
203+
<h2 id="development-toolchains-and-compilers-3">Development Toolchains and Compilers</h2>
156204
<ul>
157205
<li>IAR Embedded Workbench for ARM (EWARM) toolchain V8.20.2</li>
158206
<li>RealView Microcontroller Development Kit (MDK-ARM) toolchain V5.25</li>
159207
<li>System Workbench STM32 (SW4STM32) toolchain V2.7</li>
160208
</ul>
161-
<h2 id="supported-devices-and-boards-2">Supported Devices and boards</h2>
209+
<h2 id="supported-devices-and-boards-3">Supported Devices and boards</h2>
162210
<ul>
163211
<li>STM32WB55xx and STM32WB50xx devices</li>
164212
</ul>
@@ -167,8 +215,8 @@ <h2 id="supported-devices-and-boards-2">Supported Devices and boards</h2>
167215
<div class="collapse">
168216
<input type="checkbox" id="collapse-section2" aria-hidden="true"> <label for="collapse-section2" aria-hidden="true">V1.1.0 / 05-April-2019</label>
169217
<div>
170-
<h2 id="main-changes-3">Main Changes</h2>
171-
<h3 id="maintenance-release">Maintenance release</h3>
218+
<h2 id="main-changes-4">Main Changes</h2>
219+
<h3 id="maintenance-release-1">Maintenance release</h3>
172220
<p>Maintenance release for <strong>STM32WBxx</strong> devices (stm32wb55xx devices)</p>
173221
<table>
174222
<caption>Fixed bugs list</caption>
@@ -191,7 +239,7 @@ <h3 id="maintenance-release">Maintenance release</h3>
191239
<div class="collapse">
192240
<input type="checkbox" id="collapse-section1" aria-hidden="true"> <label for="collapse-section1" aria-hidden="true">V1.0.0 / 06-February-2019</label>
193241
<div>
194-
<h2 id="main-changes-4">Main Changes</h2>
242+
<h2 id="main-changes-5">Main Changes</h2>
195243
<h3 id="first-release">First release</h3>
196244
<p>Add support of STM32WB55xx.</p>
197245
</div>

‎system/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/gcc/linker/stm32wb30xx_flash_cm4.ld

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,9 @@ _Min_Stack_Size = 0x1000; /* required amount of stack */
5555
/* Specify the memory areas */
5656
MEMORY
5757
{
58-
FLASH (rx) : ORIGIN = 0x08000000, LENGTH = 512K
58+
FLASH (rx) : ORIGIN = 0x08000000, LENGTH = 256K
5959
RAM1 (xrw) : ORIGIN = 0x20000004, LENGTH = 0x7FFC
60-
RAM_SHARED (xrw) : ORIGIN = 0x20008000, LENGTH = 10K
60+
RAM_SHARED (xrw) : ORIGIN = 0x20030000, LENGTH = 10K
6161
}
6262

6363
/* Define output sections */

‎system/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/gcc/linker/stm32wb35xx_flash_cm4.ld

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,9 @@ _Min_Stack_Size = 0x1000; /* required amount of stack */
5555
/* Specify the memory areas */
5656
MEMORY
5757
{
58-
FLASH (rx) : ORIGIN = 0x08000000, LENGTH = 512K
58+
FLASH (rx) : ORIGIN = 0x08000000, LENGTH = 256K
5959
RAM1 (xrw) : ORIGIN = 0x20000004, LENGTH = 0x7FFC
60-
RAM_SHARED (xrw) : ORIGIN = 0x20008000, LENGTH = 10K
60+
RAM_SHARED (xrw) : ORIGIN = 0x20030000, LENGTH = 10K
6161
}
6262

6363
/* Define output sections */

‎system/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/gcc/startup_stm32wb30xx_cm4.s

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,8 @@ LoopFillZerobss:
9393
Reset_Handler:
9494
ldr r0, =_estack
9595
mov sp, r0 /* set stack pointer */
96+
/* Call the clock system intitialization function.*/
97+
bl SystemInit
9698

9799
/* Copy the data segment initializers from flash to SRAM */
98100
INIT_DATA _sdata, _edata, _sidata
@@ -101,8 +103,6 @@ Reset_Handler:
101103
INIT_BSS _sbss, _ebss
102104
INIT_BSS _sMB_MEM2, _eMB_MEM2
103105

104-
/* Call the clock system intitialization function.*/
105-
bl SystemInit
106106
/* Call static constructors */
107107
bl __libc_init_array
108108
/* Call the application s entry point.*/
@@ -194,7 +194,7 @@ g_pfnVectors:
194194
.word USART1_IRQHandler
195195
.word 0
196196
.word 0
197-
.word TSC_IRQHandler
197+
.word 0
198198
.word EXTI15_10_IRQHandler
199199
.word RTC_Alarm_IRQHandler
200200
.word 0
@@ -346,9 +346,6 @@ g_pfnVectors:
346346
.weak USART1_IRQHandler
347347
.thumb_set USART1_IRQHandler,Default_Handler
348348

349-
.weak TSC_IRQHandler
350-
.thumb_set TSC_IRQHandler,Default_Handler
351-
352349
.weak EXTI15_10_IRQHandler
353350
.thumb_set EXTI15_10_IRQHandler,Default_Handler
354351

‎system/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/gcc/startup_stm32wb35xx_cm4.s

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,8 @@ LoopFillZerobss:
9393
Reset_Handler:
9494
ldr r0, =_estack
9595
mov sp, r0 /* set stack pointer */
96+
/* Call the clock system intitialization function.*/
97+
bl SystemInit
9698

9799
/* Copy the data segment initializers from flash to SRAM */
98100
INIT_DATA _sdata, _edata, _sidata
@@ -101,8 +103,6 @@ Reset_Handler:
101103
INIT_BSS _sbss, _ebss
102104
INIT_BSS _sMB_MEM2, _eMB_MEM2
103105

104-
/* Call the clock system intitialization function.*/
105-
bl SystemInit
106106
/* Call static constructors */
107107
bl __libc_init_array
108108
/* Call the application s entry point.*/
@@ -190,11 +190,11 @@ g_pfnVectors:
190190
.word I2C3_EV_IRQHandler
191191
.word I2C3_ER_IRQHandler
192192
.word SPI1_IRQHandler
193-
.word SPI2_IRQHandler
193+
.word 0
194194
.word USART1_IRQHandler
195195
.word LPUART1_IRQHandler
196196
.word 0
197-
.word TSC_IRQHandler
197+
.word 0
198198
.word EXTI15_10_IRQHandler
199199
.word RTC_Alarm_IRQHandler
200200
.word CRS_IRQHandler
@@ -358,18 +358,12 @@ g_pfnVectors:
358358
.weak SPI1_IRQHandler
359359
.thumb_set SPI1_IRQHandler,Default_Handler
360360

361-
.weak SPI2_IRQHandler
362-
.thumb_set SPI2_IRQHandler,Default_Handler
363-
364361
.weak USART1_IRQHandler
365362
.thumb_set USART1_IRQHandler,Default_Handler
366363

367364
.weak LPUART1_IRQHandler
368365
.thumb_set LPUART1_IRQHandler,Default_Handler
369366

370-
.weak TSC_IRQHandler
371-
.thumb_set TSC_IRQHandler,Default_Handler
372-
373367
.weak EXTI15_10_IRQHandler
374368
.thumb_set EXTI15_10_IRQHandler,Default_Handler
375369

‎system/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/gcc/startup_stm32wb50xx_cm4.s

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,8 @@ LoopFillZerobss:
9393
Reset_Handler:
9494
ldr r0, =_estack
9595
mov sp, r0 /* set stack pointer */
96+
/* Call the clock system intitialization function.*/
97+
bl SystemInit
9698

9799
/* Copy the data segment initializers from flash to SRAM */
98100
INIT_DATA _sdata, _edata, _sidata
@@ -101,8 +103,6 @@ Reset_Handler:
101103
INIT_BSS _sbss, _ebss
102104
INIT_BSS _sMB_MEM2, _eMB_MEM2
103105

104-
/* Call the clock system intitialization function.*/
105-
bl SystemInit
106106
/* Call static constructors */
107107
bl __libc_init_array
108108
/* Call the application s entry point.*/
@@ -192,9 +192,9 @@ g_pfnVectors:
192192
.word SPI1_IRQHandler
193193
.word 0
194194
.word USART1_IRQHandler
195-
.word LPUART1_IRQHandler
196195
.word 0
197-
.word TSC_IRQHandler
196+
.word 0
197+
.word 0
198198
.word EXTI15_10_IRQHandler
199199
.word RTC_Alarm_IRQHandler
200200
.word 0

‎system/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/gcc/startup_stm32wb55xx_cm4.s

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,8 @@ LoopFillZerobss:
9393
Reset_Handler:
9494
ldr r0, =_estack
9595
mov sp, r0 /* set stack pointer */
96+
/* Call the clock system intitialization function.*/
97+
bl SystemInit
9698

9799
/* Copy the data segment initializers from flash to SRAM */
98100
INIT_DATA _sdata, _edata, _sidata
@@ -101,8 +103,6 @@ Reset_Handler:
101103
INIT_BSS _sbss, _ebss
102104
INIT_BSS _sMB_MEM2, _eMB_MEM2
103105

104-
/* Call the clock system intitialization function.*/
105-
bl SystemInit
106106
/* Call static constructors */
107107
bl __libc_init_array
108108
/* Call the application s entry point.*/

‎system/Drivers/CMSIS/Device/ST/STM32WBxx/Source/Templates/gcc/startup_stm32wb5mxx_cm4.s

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,8 @@ LoopFillZerobss:
9393
Reset_Handler:
9494
ldr r0, =_estack
9595
mov sp, r0 /* set stack pointer */
96+
/* Call the clock system intitialization function.*/
97+
bl SystemInit
9698

9799
/* Copy the data segment initializers from flash to SRAM */
98100
INIT_DATA _sdata, _edata, _sidata
@@ -101,8 +103,6 @@ Reset_Handler:
101103
INIT_BSS _sbss, _ebss
102104
INIT_BSS _sMB_MEM2, _eMB_MEM2
103105

104-
/* Call the clock system intitialization function.*/
105-
bl SystemInit
106106
/* Call static constructors */
107107
bl __libc_init_array
108108
/* Call the application s entry point.*/

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* STM32L1: 2.3.0
1414
* STM32L4: 1.7.0
1515
* STM32MP1: 1.2.0
16-
* STM32WB: 1.4.0
16+
* STM32WB: 1.6.0
1717

1818
Release notes of each STM32YYxx CMSIS available here:
1919

0 commit comments

Comments
 (0)