Skip to content

Commit 3381c7f

Browse files
fpistmfpistm
authored
Merge pull request #1897 from fpistm/update_CubeWB
Update STM32WB HAL and CMSIS drivers
2 parents 0911397 + b7ec147 commit 3381c7f

File tree

84 files changed

+2252
-1856
lines changed

Some content is hidden

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

84 files changed

+2252
-1856
lines changed

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12162,10 +12162,8 @@ typedef struct
1216212162
/* USB Device General registers */
1216312163
/* */
1216412164
/******************************************************************************/
12165-
#define USB_BASE (0x40005C00UL) /*!< USB_IP Peripheral Registers base address */
12166-
#define USB_PMAADDR_Pos (13U)
12167-
#define USB_PMAADDR_Msk (0x20003UL << USB_PMAADDR_Pos) /*!< 0x40006000 */
12168-
#define USB_PMAADDR USB_PMAADDR_Msk /*!< USB_IP Packet Memory Area base address */
12165+
#define USB_BASE (USB1_BASE) /*!< USB_IP Peripheral Registers base address */
12166+
#define USB_PMAADDR (USB1_PMAADDR) /*!< USB_IP Packet Memory Area base address */
1216912167

1217012168
#define USB_CNTR (USB_BASE + 0x40) /*!< Control register */
1217112169
#define USB_ISTR (USB_BASE + 0x44) /*!< Interrupt status register */

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13067,10 +13067,8 @@ typedef struct
1306713067
/* USB Device General registers */
1306813068
/* */
1306913069
/******************************************************************************/
13070-
#define USB_BASE (0x40005C00UL) /*!< USB_IP Peripheral Registers base address */
13071-
#define USB_PMAADDR_Pos (13U)
13072-
#define USB_PMAADDR_Msk (0x20003UL << USB_PMAADDR_Pos) /*!< 0x40006000 */
13073-
#define USB_PMAADDR USB_PMAADDR_Msk /*!< USB_IP Packet Memory Area base address */
13070+
#define USB_BASE (USB1_BASE) /*!< USB_IP Peripheral Registers base address */
13071+
#define USB_PMAADDR (USB1_PMAADDR) /*!< USB_IP Packet Memory Area base address */
1307413072

1307513073
#define USB_CNTR (USB_BASE + 0x40) /*!< Control register */
1307613074
#define USB_ISTR (USB_BASE + 0x44) /*!< Interrupt status register */

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13067,10 +13067,8 @@ typedef struct
1306713067
/* USB Device General registers */
1306813068
/* */
1306913069
/******************************************************************************/
13070-
#define USB_BASE (0x40005C00UL) /*!< USB_IP Peripheral Registers base address */
13071-
#define USB_PMAADDR_Pos (13U)
13072-
#define USB_PMAADDR_Msk (0x20003UL << USB_PMAADDR_Pos) /*!< 0x40006000 */
13073-
#define USB_PMAADDR USB_PMAADDR_Msk /*!< USB_IP Packet Memory Area base address */
13070+
#define USB_BASE (USB1_BASE) /*!< USB_IP Peripheral Registers base address */
13071+
#define USB_PMAADDR (USB1_PMAADDR) /*!< USB_IP Packet Memory Area base address */
1307413072

1307513073
#define USB_CNTR (USB_BASE + 0x40) /*!< Control register */
1307613074
#define USB_ISTR (USB_BASE + 0x44) /*!< Interrupt status register */

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ extern "C" {
6868
* @brief CMSIS Device version number
6969
*/
7070
#define __STM32WBxx_CMSIS_VERSION_MAIN (0x01U) /*!< [31:24] main version */
71-
#define __STM32WBxx_CMSIS_VERSION_SUB1 (0x0BU) /*!< [23:16] sub1 version */
71+
#define __STM32WBxx_CMSIS_VERSION_SUB1 (0x0CU) /*!< [23:16] sub1 version */
7272
#define __STM32WBxx_CMSIS_VERSION_SUB2 (0x00U) /*!< [15:8] sub2 version */
7373
#define __STM32WBxx_CMSIS_VERSION_RC (0x00U) /*!< [7:0] release candidate */
7474
#define __STM32WBxx_CMSIS_DEVICE_VERSION ((__STM32WBxx_CMSIS_VERSION_MAIN << 24)\

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

Lines changed: 39 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ <h1 id="purpose">Purpose</h1>
4343
<p>Various template file are provided to easily build an application. They can be adapted to fit applications requirements.</p>
4444
<ul>
4545
<li>Templates/system_stm32wbxx.c contains the initialization code referred as SystemInit.</li>
46-
<li>Startup files are provided as example for IAR©, KEIL© and SW4STM32©.</li>
47-
<li>Linker files are provided as example for IAR©, KEIL© and SW4STM32©.</li>
46+
<li>Startup files are provided as example for IAR©, KEIL© and STM32CubeIDE©.</li>
47+
<li>Linker files are provided as example for IAR©, KEIL© and STM32CubeIDE©.</li>
4848
</ul>
4949
<h1 id="specific-consideration-for-available-flash-size-inside-linker-file">Specific consideration for available FLASH size inside linker file</h1>
5050
<p>The available flash size depends on the wireless binary used inside the STM32WB device.</p>
@@ -90,11 +90,13 @@ <h2 id="stm32wb15xx-stm32wb10xx-and-stm32wb1mxx">STM32WB15xx, STM32WB10xx and ST
9090
<div class="col-sm-12 col-lg-8">
9191
<h1 id="update-history">Update History</h1>
9292
<div class="collapse">
93-
<input type="checkbox" id="collapse-section12" checked aria-hidden="true"> <label for="collapse-section12" aria-hidden="true">V1.11.0 / 08-June-2022</label>
93+
<input type="checkbox" id="collapse-section13" checked aria-hidden="true"> <label for="collapse-section13" aria-hidden="true">V1.12.0 / 09-November-2022</label>
9494
<div>
9595
<h2 id="main-changes">Main Changes</h2>
9696
<ul>
97-
<li>Add support for the upcoming STM32WB1M device</li>
97+
<li>Fix incorrect USB_BASE and USB_PMAADDR addresses</li>
98+
<li>Fix initialization missing of data in RAM2 memory</li>
99+
<li>Add specific LSE_VALUE for STM32WB5Mxx</li>
98100
</ul>
99101
<h2 id="supported-devices-and-boards">Supported Devices and boards</h2>
100102
<ul>
@@ -103,28 +105,41 @@ <h2 id="supported-devices-and-boards">Supported Devices and boards</h2>
103105
</div>
104106
</div>
105107
<div class="collapse">
106-
<input type="checkbox" id="collapse-section11" aria-hidden="true"> <label for="collapse-section11" aria-hidden="true">V1.10.1 / 25-March-2022</label>
108+
<input type="checkbox" id="collapse-section12" aria-hidden="true"> <label for="collapse-section12" aria-hidden="true">V1.11.0 / 08-June-2022</label>
107109
<div>
108110
<h2 id="main-changes-1">Main Changes</h2>
109111
<ul>
110-
<li>Align ADC registers naming on Reference Manual (For STM32WB15xx &amp; STM32WB10xx)</li>
112+
<li>Add support for the upcoming STM32WB1M device</li>
111113
</ul>
112114
<h2 id="supported-devices-and-boards-1">Supported Devices and boards</h2>
113115
<ul>
116+
<li>STM32WB55xx, STM32WB5Mxx, STM32WB50xx, STM32WB35xx, STM32WB30xx, STM32WB15xx, STM32WB10xx and STM32WB1Mxx devices.</li>
117+
</ul>
118+
</div>
119+
</div>
120+
<div class="collapse">
121+
<input type="checkbox" id="collapse-section11" aria-hidden="true"> <label for="collapse-section11" aria-hidden="true">V1.10.1 / 25-March-2022</label>
122+
<div>
123+
<h2 id="main-changes-2">Main Changes</h2>
124+
<ul>
125+
<li>Align ADC registers naming on Reference Manual (For STM32WB15xx &amp; STM32WB10xx)</li>
126+
</ul>
127+
<h2 id="supported-devices-and-boards-2">Supported Devices and boards</h2>
128+
<ul>
114129
<li>STM32WB55xx, STM32WB5Mxx, STM32WB50xx, STM32WB35xx, STM32WB30xx, STM32WB15xx and STM32WB10xx devices.</li>
115130
</ul>
116131
</div>
117132
</div>
118133
<div class="collapse">
119134
<input type="checkbox" id="collapse-section10" aria-hidden="true"> <label for="collapse-section10" aria-hidden="true">V1.10.0 / 12-November-2021</label>
120135
<div>
121-
<h2 id="main-changes-2">Main Changes</h2>
136+
<h2 id="main-changes-3">Main Changes</h2>
122137
<ul>
123138
<li>Update CMSIS devices drivers for all value lines not supporting SMPS</li>
124139
<li>All source files and templates: update disclaimer to add reference to the new license agreement</li>
125140
<li>Correct English spelling typos and remove non UTF-8 characters in comments</li>
126141
</ul>
127-
<h2 id="supported-devices-and-boards-2">Supported Devices and boards</h2>
142+
<h2 id="supported-devices-and-boards-3">Supported Devices and boards</h2>
128143
<ul>
129144
<li>STM32WB55xx, STM32WB5Mxx, STM32WB50xx, STM32WB35xx, STM32WB30xx, STM32WB15xx and STM32WB10xx devices.</li>
130145
</ul>
@@ -133,7 +148,7 @@ <h2 id="supported-devices-and-boards-2">Supported Devices and boards</h2>
133148
<div class="collapse">
134149
<input type="checkbox" id="collapse-section9" aria-hidden="true"> <label for="collapse-section9" aria-hidden="true">V1.9.0 / 24-June-2021</label>
135150
<div>
136-
<h2 id="main-changes-3">Main Changes</h2>
151+
<h2 id="main-changes-4">Main Changes</h2>
137152
<ul>
138153
<li>Add atomic register access services:
139154
<ul>
@@ -147,7 +162,7 @@ <h2 id="main-changes-3">Main Changes</h2>
147162
<li>Add define LSI_STARTUP_TIME used in default IWDG timeout calculation (HAL_IWDG_DEFAULT_TIMEOUT)</li>
148163
<li>Add define FLASH_ECCR_CPUID bits for new macro __HAL_FLASH_ECC_CPUID() macro</li>
149164
</ul>
150-
<h2 id="supported-devices-and-boards-3">Supported Devices and boards</h2>
165+
<h2 id="supported-devices-and-boards-4">Supported Devices and boards</h2>
151166
<ul>
152167
<li>STM32WB55xx, STM32WB5Mxx, STM32WB50xx, STM32WB35xx, STM32WB30xx, STM32WB15xx and STM32WB10xx devices.</li>
153168
</ul>
@@ -156,7 +171,7 @@ <h2 id="supported-devices-and-boards-3">Supported Devices and boards</h2>
156171
<div class="collapse">
157172
<input type="checkbox" id="collapse-section8" aria-hidden="true"> <label for="collapse-section8" aria-hidden="true">V1.8.0 / 09-February-2021</label>
158173
<div>
159-
<h2 id="main-changes-4">Main Changes</h2>
174+
<h2 id="main-changes-5">Main Changes</h2>
160175
<h3 id="add-support-for-stm32wb15xx-and-stm32wb10xx">Add support for STM32WB15xx and STM32WB10xx</h3>
161176
<ul>
162177
<li>Change how to adapt VTOR for user</li>
@@ -167,7 +182,7 @@ <h2 id="development-toolchains-and-compilers">Development Toolchains and Compile
167182
<li>RealView Microcontroller Development Kit (MDK-ARM) toolchain V5.25</li>
168183
<li>System Workbench STM32 (SW4STM32) toolchain V2.7</li>
169184
</ul>
170-
<h2 id="supported-devices-and-boards-4">Supported Devices and boards</h2>
185+
<h2 id="supported-devices-and-boards-5">Supported Devices and boards</h2>
171186
<ul>
172187
<li>STM32WB55xx, STM32WB5Mxx, STM32WB50xx, STM32WB35xx, STM32WB30xx, STM32WB15xx and STM32WB10xx devices.</li>
173188
</ul>
@@ -176,7 +191,7 @@ <h2 id="supported-devices-and-boards-4">Supported Devices and boards</h2>
176191
<div class="collapse">
177192
<input type="checkbox" id="collapse-section7" aria-hidden="true"> <label for="collapse-section7" aria-hidden="true">V1.7.0 / 30-October-2020</label>
178193
<div>
179-
<h2 id="main-changes-5">Main Changes</h2>
194+
<h2 id="main-changes-6">Main Changes</h2>
180195
<h3 id="maintenance-release">Maintenance release</h3>
181196
<p>Maintenance release for <strong>STM32WBxx</strong> devices (stm32wb55xx, stm32wb50xx, stm32wb35xx and stm32wb30xx devices)</p>
182197
<table>
@@ -206,7 +221,7 @@ <h2 id="development-toolchains-and-compilers-1">Development Toolchains and Compi
206221
<li>RealView Microcontroller Development Kit (MDK-ARM) toolchain V5.25</li>
207222
<li>System Workbench STM32 (SW4STM32) toolchain V2.7</li>
208223
</ul>
209-
<h2 id="supported-devices-and-boards-5">Supported Devices and boards</h2>
224+
<h2 id="supported-devices-and-boards-6">Supported Devices and boards</h2>
210225
<ul>
211226
<li>STM32WB55xx, STM32WB5Mxx, STM32WB50xx, STM32WB35xx and STM32WB30xx devices.</li>
212227
</ul>
@@ -215,7 +230,7 @@ <h2 id="supported-devices-and-boards-5">Supported Devices and boards</h2>
215230
<div class="collapse">
216231
<input type="checkbox" id="collapse-section6" aria-hidden="true"> <label for="collapse-section6" aria-hidden="true">v1.6.0 / 05-June-2020</label>
217232
<div>
218-
<h2 id="main-changes-6">Main Changes</h2>
233+
<h2 id="main-changes-7">Main Changes</h2>
219234
<h3 id="maintenance-release-1">Maintenance release</h3>
220235
<p>Maintenance release for <strong>STM32WBxx</strong> devices (stm32wb55xx, stm32wb50xx, stm32wb35xx and stm32wb30xx devices)</p>
221236
<table>
@@ -254,7 +269,7 @@ <h2 id="development-toolchains-and-compilers-2">Development Toolchains and Compi
254269
<li>RealView Microcontroller Development Kit (MDK-ARM) toolchain V5.25</li>
255270
<li>System Workbench STM32 (SW4STM32) toolchain V2.7</li>
256271
</ul>
257-
<h2 id="supported-devices-and-boards-6">Supported Devices and boards</h2>
272+
<h2 id="supported-devices-and-boards-7">Supported Devices and boards</h2>
258273
<ul>
259274
<li>STM32WB55xx, STM32WB5Mxx, STM32WB50xx, STM32WB35xx and STM32WB30xx devices.</li>
260275
</ul>
@@ -263,7 +278,7 @@ <h2 id="supported-devices-and-boards-6">Supported Devices and boards</h2>
263278
<div class="collapse">
264279
<input type="checkbox" id="collapse-section5" aria-hidden="true"> <label for="collapse-section5" aria-hidden="true">V1.4.0 / 12-February-2020</label>
265280
<div>
266-
<h2 id="main-changes-7">Main Changes</h2>
281+
<h2 id="main-changes-8">Main Changes</h2>
267282
<h3 id="introduction-of-stm32wb35xx-stm32wb30xx-and-stm32wb5mxx-product">Introduction of STM32WB35xx, STM32WB30xx and STM32WB5Mxx product</h3>
268283
<p>This release introduce the support of STM32WB5Mxx, STM32WB35xx product and its value line STM32WB30xx.</p>
269284
<p>Added features:</p>
@@ -281,7 +296,7 @@ <h2 id="development-toolchains-and-compilers-3">Development Toolchains and Compi
281296
<li>RealView Microcontroller Development Kit (MDK-ARM) toolchain V5.25</li>
282297
<li>System Workbench STM32 (SW4STM32) toolchain V2.7</li>
283298
</ul>
284-
<h2 id="supported-devices-and-boards-7">Supported Devices and boards</h2>
299+
<h2 id="supported-devices-and-boards-8">Supported Devices and boards</h2>
285300
<ul>
286301
<li>STM32WB55xx, STM32WB5Mxx, STM32WB50xx, STM32WB35xx and STM32WB30xx devices.</li>
287302
</ul>
@@ -290,7 +305,7 @@ <h2 id="supported-devices-and-boards-7">Supported Devices and boards</h2>
290305
<div class="collapse">
291306
<input type="checkbox" id="collapse-section4" aria-hidden="true"> <label for="collapse-section4" aria-hidden="true">V1.3.0 / 11-September-2019</label>
292307
<div>
293-
<h2 id="main-changes-8">Main Changes</h2>
308+
<h2 id="main-changes-9">Main Changes</h2>
294309
<p>Maintenance release for <strong>STM32WBxx</strong> devices (stm32wb55xx and stm32wb50xx devices)</p>
295310
<table>
296311
<thead>
@@ -319,7 +334,7 @@ <h2 id="development-toolchains-and-compilers-4">Development Toolchains and Compi
319334
<li>RealView Microcontroller Development Kit (MDK-ARM) toolchain V5.25</li>
320335
<li>System Workbench STM32 (SW4STM32) toolchain V2.7</li>
321336
</ul>
322-
<h2 id="supported-devices-and-boards-8">Supported Devices and boards</h2>
337+
<h2 id="supported-devices-and-boards-9">Supported Devices and boards</h2>
323338
<ul>
324339
<li>STM32WB55xx, STM32WB50xx devices</li>
325340
</ul>
@@ -328,7 +343,7 @@ <h2 id="supported-devices-and-boards-8">Supported Devices and boards</h2>
328343
<div class="collapse">
329344
<input type="checkbox" id="collapse-section3" aria-hidden="true"> <label for="collapse-section3" aria-hidden="true">V1.2.0 / 26-June-2019</label>
330345
<div>
331-
<h2 id="main-changes-9">Main Changes</h2>
346+
<h2 id="main-changes-10">Main Changes</h2>
332347
<h3 id="introduction-of-stm32wb50xx-device">Introduction of STM32WB50xx device</h3>
333348
<p>First release for STM32WBxx CMSIS introducing <strong>stm32wb50xx</strong> devices.</p>
334349
<h2 id="contents">Contents</h2>
@@ -339,7 +354,7 @@ <h2 id="development-toolchains-and-compilers-5">Development Toolchains and Compi
339354
<li>RealView Microcontroller Development Kit (MDK-ARM) toolchain V5.25</li>
340355
<li>System Workbench STM32 (SW4STM32) toolchain V2.7</li>
341356
</ul>
342-
<h2 id="supported-devices-and-boards-9">Supported Devices and boards</h2>
357+
<h2 id="supported-devices-and-boards-10">Supported Devices and boards</h2>
343358
<ul>
344359
<li>STM32WB55xx and STM32WB50xx devices</li>
345360
</ul>
@@ -348,7 +363,7 @@ <h2 id="supported-devices-and-boards-9">Supported Devices and boards</h2>
348363
<div class="collapse">
349364
<input type="checkbox" id="collapse-section2" aria-hidden="true"> <label for="collapse-section2" aria-hidden="true">V1.1.0 / 05-April-2019</label>
350365
<div>
351-
<h2 id="main-changes-10">Main Changes</h2>
366+
<h2 id="main-changes-11">Main Changes</h2>
352367
<h3 id="maintenance-release-2">Maintenance release</h3>
353368
<p>Maintenance release for <strong>STM32WBxx</strong> devices (stm32wb55xx devices)</p>
354369
<table>
@@ -372,7 +387,7 @@ <h3 id="maintenance-release-2">Maintenance release</h3>
372387
<div class="collapse">
373388
<input type="checkbox" id="collapse-section1" aria-hidden="true"> <label for="collapse-section1" aria-hidden="true">V1.0.0 / 06-February-2019</label>
374389
<div>
375-
<h2 id="main-changes-11">Main Changes</h2>
390+
<h2 id="main-changes-12">Main Changes</h2>
376391
<h3 id="first-release">First release</h3>
377392
<p>Add support of STM32WB55xx.</p>
378393
</div>

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

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
/*
1+
/**
22
******************************************************************************
33
**
4-
** File : LinkerScript.ld
4+
** File : stm32wb10xx_flash_cm4.ld
55
**
66
** Author : STM32CubeIDE
77
**
8-
** Abstract : Linker script for STM32WB15xC Device
8+
** Abstract : Linker script for STM32WB10xx Device
99
** 320Kbytes FLASH
1010
** 48Kbytes RAM
1111
**
@@ -22,7 +22,7 @@
2222
*****************************************************************************
2323
** @attention
2424
**
25-
** Copyright (c) 2020 STMicroelectronics.
25+
** Copyright (c) 2020-2022 STMicroelectronics.
2626
** All rights reserved.
2727
**
2828
** This software is licensed under terms that can be found in the LICENSE file
@@ -38,7 +38,7 @@ ENTRY(Reset_Handler)
3838
/* Highest address of the user mode stack */
3939
_estack = 0x20003000; /* end of RAM */
4040
/* Generate a link error if heap and stack don't fit into RAM */
41-
_Min_Heap_Size = 0x400 ; /* required amount of heap */
41+
_Min_Heap_Size = 0x400 ; /* required amount of heap */
4242
_Min_Stack_Size = 0x1000 ; /* required amount of stack */
4343

4444
/* Specify the memory areas */
@@ -131,7 +131,6 @@ SECTIONS
131131
_edata = .; /* define a global symbol at data end */
132132
} >RAM1 AT> FLASH
133133

134-
135134
/* Uninitialized data section */
136135
. = ALIGN(4);
137136
.bss :
@@ -159,8 +158,6 @@ SECTIONS
159158
. = ALIGN(8);
160159
} >RAM1
161160

162-
163-
164161
/* Remove information from the standard libraries */
165162
/DISCARD/ :
166163
{
@@ -170,7 +167,15 @@ SECTIONS
170167
}
171168

172169
.ARM.attributes 0 : { *(.ARM.attributes) }
173-
MAPPING_TABLE (NOLOAD) : { *(MAPPING_TABLE) } >RAM_SHARED
174-
MB_MEM1 (NOLOAD) : { *(MB_MEM1) } >RAM_SHARED
175-
MB_MEM2 (NOLOAD) : { _sMB_MEM2 = . ; *(MB_MEM2) ; _eMB_MEM2 = . ; } >RAM_SHARED
170+
MAPPING_TABLE (NOLOAD) : { *(MAPPING_TABLE) } >RAM_SHARED
171+
MB_MEM1 (NOLOAD) : { *(MB_MEM1) } >RAM_SHARED
172+
173+
/* used by the startup to initialize .MB_MEM2 data */
174+
_siMB_MEM2 = LOADADDR(.MB_MEM2);
175+
.MB_MEM2 :
176+
{
177+
_sMB_MEM2 = . ;
178+
*(MB_MEM2) ;
179+
_eMB_MEM2 = . ;
180+
} >RAM_SHARED AT> FLASH
176181
}

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy