Skip to content

Commit f2ba8ca

Browse files
committed
1 parent fbe0409 commit f2ba8ca

File tree

168 files changed

+12093
-5213
lines changed

Some content is hidden

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

168 files changed

+12093
-5213
lines changed

targets/TARGET_STM/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ This table summarizes the STM32Cube versions currently used in Mbed OS master br
7373
| L0 | 1.10.0 | https://github.com/STMicroelectronics/STM32CubeL0 |
7474
| L1 | 1.8.1 | https://github.com/STMicroelectronics/STM32CubeL1 |
7575
| L4 | 1.14.0 | https://github.com/STMicroelectronics/STM32CubeL4 |
76-
| L5 | 1.1.0 | https://github.com/STMicroelectronics/STM32CubeL5 |
76+
| L5 | 1.3.0 | https://github.com/STMicroelectronics/STM32CubeL5 |
7777
| WB | 1.7.0 | https://github.com/STMicroelectronics/STM32CubeWB |
7878

7979
In Mbed OS repository, we try to minimize the difference between "official" and copied files.

targets/TARGET_STM/TARGET_STM32L5/STM32Cube_FW/CMSIS/partition_stm32l5xx.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616
* <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
1717
* All rights reserved.</center></h2>
1818
*
19-
* This software component is licensed by ST under BSD 3-Clause license,
19+
* This software component is licensed by ST under Apache License, Version 2.0,
2020
* the "License"; You may not use this file except in compliance with the
2121
* License. You may obtain a copy of the License at:
22-
* opensource.org/licenses/BSD-3-Clause
22+
* opensource.org/licenses/Apache-2.0
2323
*
2424
******************************************************************************
2525
*/

targets/TARGET_STM/TARGET_STM32L5/STM32Cube_FW/CMSIS/stm32l552xx.h

Lines changed: 109 additions & 121 deletions
Large diffs are not rendered by default.

targets/TARGET_STM/TARGET_STM32L5/STM32Cube_FW/CMSIS/stm32l562xx.h

Lines changed: 113 additions & 125 deletions
Large diffs are not rendered by default.

targets/TARGET_STM/TARGET_STM32L5/STM32Cube_FW/CMSIS/stm32l5xx.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
* <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
2020
* All rights reserved.</center></h2>
2121
*
22-
* This software component is licensed by ST under BSD 3-Clause license,
22+
* This software component is licensed by ST under Apache License, Version 2.0,
2323
* the "License"; You may not use this file except in compliance with the
2424
* License. You may obtain a copy of the License at:
25-
* opensource.org/licenses/BSD-3-Clause
25+
* opensource.org/licenses/Apache-2.0
2626
*
2727
******************************************************************************
2828
*/
@@ -79,7 +79,7 @@
7979
*/
8080
#define __STM32L5_CMSIS_VERSION_MAIN (0x01U) /*!< [31:24] main version */
8181
#define __STM32L5_CMSIS_VERSION_SUB1 (0x00U) /*!< [23:16] sub1 version */
82-
#define __STM32L5_CMSIS_VERSION_SUB2 (0x00U) /*!< [15:8] sub2 version */
82+
#define __STM32L5_CMSIS_VERSION_SUB2 (0x03U) /*!< [15:8] sub2 version */
8383
#define __STM32L5_CMSIS_VERSION_RC (0x00U) /*!< [7:0] release candidate */
8484
#define __STM32L5_CMSIS_VERSION ((__STM32L5_CMSIS_VERSION_MAIN << 24U)\
8585
|(__STM32L5_CMSIS_VERSION_SUB1 << 16U)\

targets/TARGET_STM/TARGET_STM32L5/STM32Cube_FW/CMSIS/system_stm32l5xx.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
* <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
1010
* All rights reserved.</center></h2>
1111
*
12-
* This software component is licensed by ST under BSD 3-Clause license,
12+
* This software component is licensed by ST under Apache License, Version 2.0,
1313
* the "License"; You may not use this file except in compliance with the
1414
* License. You may obtain a copy of the License at:
15-
* opensource.org/licenses/BSD-3-Clause
15+
* opensource.org/licenses/Apache-2.0
1616
*
1717
******************************************************************************
1818
*/

targets/TARGET_STM/TARGET_STM32L5/STM32Cube_FW/STM32L5xx_HAL_Driver/Legacy/stm32_hal_legacy.h

Lines changed: 32 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@
241241
#define DAC_CHIPCONNECT_ENABLE DAC_CHIPCONNECT_INTERNAL
242242
#endif
243243

244-
#if defined(STM32L1) || defined(STM32L4) || defined(STM32G0) || defined(STM32L5) || defined(STM32H7) || defined(STM32F4)
244+
#if defined(STM32L1) || defined(STM32L4) || defined(STM32G0) || defined(STM32L5) || defined(STM32H7) || defined(STM32F4) || defined(STM32G4)
245245
#define HAL_DAC_MSP_INIT_CB_ID HAL_DAC_MSPINIT_CB_ID
246246
#define HAL_DAC_MSP_DEINIT_CB_ID HAL_DAC_MSPDEINIT_CB_ID
247247
#endif
@@ -313,8 +313,13 @@
313313
#endif /* STM32L4 */
314314

315315
#if defined(STM32G0)
316-
#define DMA_REQUEST_DAC1_CHANNEL1 DMA_REQUEST_DAC1_CH1
317-
#define DMA_REQUEST_DAC1_CHANNEL2 DMA_REQUEST_DAC1_CH2
316+
#define DMA_REQUEST_DAC1_CHANNEL1 DMA_REQUEST_DAC1_CH1
317+
#define DMA_REQUEST_DAC1_CHANNEL2 DMA_REQUEST_DAC1_CH2
318+
#define DMA_REQUEST_TIM16_TRIG_COM DMA_REQUEST_TIM16_COM
319+
#define DMA_REQUEST_TIM17_TRIG_COM DMA_REQUEST_TIM17_COM
320+
321+
#define LL_DMAMUX_REQ_TIM16_TRIG_COM LL_DMAMUX_REQ_TIM16_COM
322+
#define LL_DMAMUX_REQ_TIM17_TRIG_COM LL_DMAMUX_REQ_TIM17_COM
318323
#endif
319324

320325
#if defined(STM32H7)
@@ -643,6 +648,10 @@
643648
#define HAL_HRTIM_ExternalEventCounterEnable HAL_HRTIM_ExtEventCounterEnable
644649
#define HAL_HRTIM_ExternalEventCounterDisable HAL_HRTIM_ExtEventCounterDisable
645650
#define HAL_HRTIM_ExternalEventCounterReset HAL_HRTIM_ExtEventCounterReset
651+
#define HRTIM_TIMEEVENT_A HRTIM_EVENTCOUNTER_A
652+
#define HRTIM_TIMEEVENT_B HRTIM_EVENTCOUNTER_B
653+
#define HRTIM_TIMEEVENTRESETMODE_UNCONDITIONAL HRTIM_EVENTCOUNTER_RSTMODE_UNCONDITIONAL
654+
#define HRTIM_TIMEEVENTRESETMODE_CONDITIONAL HRTIM_EVENTCOUNTER_RSTMODE_CONDITIONAL
646655
#endif /* STM32G4 */
647656

648657
#if defined(STM32H7)
@@ -955,7 +964,7 @@
955964
#define OPAMP_PGACONNECT_VM0 OPAMP_PGA_CONNECT_INVERTINGINPUT_IO0
956965
#define OPAMP_PGACONNECT_VM1 OPAMP_PGA_CONNECT_INVERTINGINPUT_IO1
957966

958-
#if defined(STM32L1) || defined(STM32L4) || defined(STM32L5) || defined(STM32H7)
967+
#if defined(STM32L1) || defined(STM32L4) || defined(STM32L5) || defined(STM32H7) || defined(STM32G4)
959968
#define HAL_OPAMP_MSP_INIT_CB_ID HAL_OPAMP_MSPINIT_CB_ID
960969
#define HAL_OPAMP_MSP_DEINIT_CB_ID HAL_OPAMP_MSPDEINIT_CB_ID
961970
#endif
@@ -1014,7 +1023,7 @@
10141023
/**
10151024
* @}
10161025
*/
1017-
1026+
10181027
/** @defgroup HAL_RTC_Aliased_Defines HAL RTC Aliased Defines maintained for legacy purpose
10191028
* @{
10201029
*/
@@ -1450,8 +1459,8 @@
14501459
#define HASH_HMACKeyType_ShortKey HASH_HMAC_KEYTYPE_SHORTKEY
14511460
#define HASH_HMACKeyType_LongKey HASH_HMAC_KEYTYPE_LONGKEY
14521461

1453-
#if defined(STM32L4) || defined(STM32L5)
1454-
1462+
#if defined(STM32L4) || defined(STM32L5) || defined(STM32F4) || defined(STM32F7) || defined(STM32H7)
1463+
14551464
#define HAL_HASH_MD5_Accumulate HAL_HASH_MD5_Accmlt
14561465
#define HAL_HASH_MD5_Accumulate_End HAL_HASH_MD5_Accmlt_End
14571466
#define HAL_HASH_MD5_Accumulate_IT HAL_HASH_MD5_Accmlt_IT
@@ -1472,7 +1481,7 @@
14721481
#define HAL_HASHEx_SHA256_Accumulate_IT HAL_HASHEx_SHA256_Accmlt_IT
14731482
#define HAL_HASHEx_SHA256_Accumulate_End_IT HAL_HASHEx_SHA256_Accmlt_End_IT
14741483

1475-
#endif /* STM32L4 || STM32L5 */
1484+
#endif /* STM32L4 || STM32L5 || STM32F4 || STM32F7 || STM32H7 */
14761485
/**
14771486
* @}
14781487
*/
@@ -1531,18 +1540,18 @@
15311540

15321541
#define HAL_I2CFastModePlusConfig(SYSCFG_I2CFastModePlus, cmd) (((cmd)==ENABLE)? HAL_I2CEx_EnableFastModePlus(SYSCFG_I2CFastModePlus): HAL_I2CEx_DisableFastModePlus(SYSCFG_I2CFastModePlus))
15331542

1534-
#if defined(STM32H7) || defined(STM32WB) || defined(STM32G0) || defined(STM32F0) || defined(STM32F1) || defined(STM32F2) || defined(STM32F3) || defined(STM32F4) || defined(STM32F7) || defined(STM32L0) || defined(STM32L4) || defined(STM32L5) || defined(STM32G4)
1543+
#if defined(STM32H7) || defined(STM32WB) || defined(STM32G0) || defined(STM32F0) || defined(STM32F1) || defined(STM32F2) || defined(STM32F3) || defined(STM32F4) || defined(STM32F7) || defined(STM32L0) || defined(STM32L4) || defined(STM32L5) || defined(STM32G4) || defined(STM32L1)
15351544
#define HAL_I2C_Master_Sequential_Transmit_IT HAL_I2C_Master_Seq_Transmit_IT
15361545
#define HAL_I2C_Master_Sequential_Receive_IT HAL_I2C_Master_Seq_Receive_IT
15371546
#define HAL_I2C_Slave_Sequential_Transmit_IT HAL_I2C_Slave_Seq_Transmit_IT
15381547
#define HAL_I2C_Slave_Sequential_Receive_IT HAL_I2C_Slave_Seq_Receive_IT
1539-
#endif /* STM32H7 || STM32WB || STM32G0 || STM32F0 || STM32F1 || STM32F2 || STM32F3 || STM32F4 || STM32F7 || STM32L0 || STM32L4 || STM32L5 || STM32G4 */
1540-
#if defined(STM32H7) || defined(STM32WB) || defined(STM32G0) || defined(STM32F4) || defined(STM32F7) || defined(STM32L0) || defined(STM32L4) || defined(STM32L5) || defined(STM32G4)
1548+
#endif /* STM32H7 || STM32WB || STM32G0 || STM32F0 || STM32F1 || STM32F2 || STM32F3 || STM32F4 || STM32F7 || STM32L0 || STM32L4 || STM32L5 || STM32G4 || STM32L1 */
1549+
#if defined(STM32H7) || defined(STM32WB) || defined(STM32G0) || defined(STM32F4) || defined(STM32F7) || defined(STM32L0) || defined(STM32L4) || defined(STM32L5) || defined(STM32G4)|| defined(STM32L1)
15411550
#define HAL_I2C_Master_Sequential_Transmit_DMA HAL_I2C_Master_Seq_Transmit_DMA
15421551
#define HAL_I2C_Master_Sequential_Receive_DMA HAL_I2C_Master_Seq_Receive_DMA
15431552
#define HAL_I2C_Slave_Sequential_Transmit_DMA HAL_I2C_Slave_Seq_Transmit_DMA
15441553
#define HAL_I2C_Slave_Sequential_Receive_DMA HAL_I2C_Slave_Seq_Receive_DMA
1545-
#endif /* STM32H7 || STM32WB || STM32G0 || STM32F4 || STM32F7 || STM32L0 || STM32L4 || STM32L5 || STM32G4 */
1554+
#endif /* STM32H7 || STM32WB || STM32G0 || STM32F4 || STM32F7 || STM32L0 || STM32L4 || STM32L5 || STM32G4 || STM32L1 */
15461555

15471556
#if defined(STM32F4)
15481557
#define HAL_FMPI2C_Master_Sequential_Transmit_IT HAL_FMPI2C_Master_Seq_Transmit_IT
@@ -1563,10 +1572,10 @@
15631572
*/
15641573

15651574
#if defined(STM32G0)
1566-
#define HAL_PWR_ConfigPVD HAL_PWREx_ConfigPVD
1567-
#define HAL_PWR_EnablePVD HAL_PWREx_EnablePVD
1568-
#define HAL_PWR_DisablePVD HAL_PWREx_DisablePVD
1569-
#define HAL_PWR_PVD_IRQHandler HAL_PWREx_PVD_IRQHandler
1575+
#define HAL_PWR_ConfigPVD HAL_PWREx_ConfigPVD
1576+
#define HAL_PWR_EnablePVD HAL_PWREx_EnablePVD
1577+
#define HAL_PWR_DisablePVD HAL_PWREx_DisablePVD
1578+
#define HAL_PWR_PVD_IRQHandler HAL_PWREx_PVD_IRQHandler
15701579
#endif
15711580
#define HAL_PWR_PVDConfig HAL_PWR_ConfigPVD
15721581
#define HAL_PWR_DisableBkUpReg HAL_PWREx_DisableBkUpReg
@@ -3243,9 +3252,8 @@
32433252
#define RCC_MCOSOURCE_PLLCLK_NODIV RCC_MCO1SOURCE_PLLCLK
32443253
#define RCC_MCOSOURCE_PLLCLK_DIV2 RCC_MCO1SOURCE_PLLCLK_DIV2
32453254

3246-
#if defined(STM32L4)
3255+
#if defined(STM32L4) || defined(STM32WB) || defined(STM32G0) || defined(STM32G4) || defined(STM32L5)
32473256
#define RCC_RTCCLKSOURCE_NO_CLK RCC_RTCCLKSOURCE_NONE
3248-
#elif defined(STM32WB) || defined(STM32G0) || defined(STM32G4) || defined(STM32L5)
32493257
#else
32503258
#define RCC_RTCCLKSOURCE_NONE RCC_RTCCLKSOURCE_NO_CLK
32513259
#endif
@@ -3373,7 +3381,7 @@
33733381
/** @defgroup HAL_RTC_Aliased_Macros HAL RTC Aliased Macros maintained for legacy purpose
33743382
* @{
33753383
*/
3376-
#if defined (STM32G0) || defined (STM32L5) || defined (STM32L412xx) || defined (STM32L422xx) || defined (STM32G4)
3384+
#if defined (STM32G0) || defined (STM32L5) || defined (STM32L412xx) || defined (STM32L422xx) || defined (STM32L4P5xx) || defined (STM32L4Q5xx) || defined (STM32G4)
33773385
#else
33783386
#define __HAL_RTC_CLEAR_FLAG __HAL_RTC_EXTI_CLEAR_FLAG
33793387
#endif
@@ -3481,9 +3489,9 @@
34813489
#define __HAL_SD_SDIO_CLEAR_FLAG __HAL_SD_SDMMC_CLEAR_FLAG
34823490
#define __HAL_SD_SDIO_GET_IT __HAL_SD_SDMMC_GET_IT
34833491
#define __HAL_SD_SDIO_CLEAR_IT __HAL_SD_SDMMC_CLEAR_IT
3484-
#define SDIO_STATIC_FLAGS SDMMC_STATIC_FLAGS
3485-
#define SDIO_CMD0TIMEOUT SDMMC_CMD0TIMEOUT
3486-
#define SD_SDIO_SEND_IF_COND SD_SDMMC_SEND_IF_COND
3492+
#define SDIO_STATIC_FLAGS SDMMC_STATIC_FLAGS
3493+
#define SDIO_CMD0TIMEOUT SDMMC_CMD0TIMEOUT
3494+
#define SD_SDIO_SEND_IF_COND SD_SDMMC_SEND_IF_COND
34873495
/* alias CMSIS for compatibilities */
34883496
#define SDIO_IRQn SDMMC1_IRQn
34893497
#define SDIO_IRQHandler SDMMC1_IRQHandler
@@ -3751,9 +3759,9 @@
37513759
/** @defgroup HAL_QSPI_Aliased_Macros HAL QSPI Aliased Macros maintained for legacy purpose
37523760
* @{
37533761
*/
3754-
#if defined (STM32L4)
3762+
#if defined (STM32L4) || defined (STM32F4) || defined (STM32F7) || defined(STM32H7)
37553763
#define HAL_QPSI_TIMEOUT_DEFAULT_VALUE HAL_QSPI_TIMEOUT_DEFAULT_VALUE
3756-
#endif
3764+
#endif /* STM32L4 || STM32F4 || STM32F7 */
37573765
/**
37583766
* @}
37593767
*/

0 commit comments

Comments
 (0)