Skip to content

Commit 3f3310d

Browse files
FRASTMerwango
authored andcommitted
stm32cube: update stm32h5 to cube version V1.6.0
Update Cube version for STM32H5xx series on https://github.com/STMicroelectronics from version v1.5.0 to version v1.6.0 Signed-off-by: F. Ramu <francois.ramu@st.com>
1 parent 46e113a commit 3f3310d

File tree

154 files changed

+179629
-3206
lines changed

Some content is hidden

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

154 files changed

+179629
-3206
lines changed

stm32cube/stm32h5xx/CMakeLists.txt

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ zephyr_library_sources(drivers/src/stm32h5xx_hal_rcc.c)
88
zephyr_library_sources(drivers/src/stm32h5xx_hal_rcc_ex.c)
99
zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_ADC drivers/src/stm32h5xx_hal_adc.c)
1010
zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_ADC_EX drivers/src/stm32h5xx_hal_adc_ex.c)
11+
zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_CCB drivers/src/stm32h5xx_hal_ccb.c)
1112
zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_CEC drivers/src/stm32h5xx_hal_cec.c)
1213
zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_COMP drivers/src/stm32h5xx_hal_comp.c)
1314
zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_CORDIC drivers/src/stm32h5xx_hal_cordic.c)
@@ -21,6 +22,7 @@ zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_DAC_EX drivers/src/stm32h5xx_h
2122
zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_DCACHE drivers/src/stm32h5xx_hal_dcache.c)
2223
zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_DCMI drivers/src/stm32h5xx_hal_dcmi.c)
2324
zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_DMA drivers/src/stm32h5xx_hal_dma.c)
25+
zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_DMA2D drivers/src/stm32h5xx_hal_dma2d.c)
2426
zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_DMA_EX drivers/src/stm32h5xx_hal_dma_ex.c)
2527
zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_DTS drivers/src/stm32h5xx_hal_dts.c)
2628
zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_ETH drivers/src/stm32h5xx_hal_eth.c)
@@ -30,6 +32,7 @@ zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_FDCAN drivers/src/stm32h5xx_ha
3032
zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_FLASH drivers/src/stm32h5xx_hal_flash.c)
3133
zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_FLASH_EX drivers/src/stm32h5xx_hal_flash_ex.c)
3234
zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_FMAC drivers/src/stm32h5xx_hal_fmac.c)
35+
zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_GFXTIM drivers/src/stm32h5xx_hal_gfxtim.c)
3336
zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_GPIO drivers/src/stm32h5xx_hal_gpio.c)
3437
zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_GTZC drivers/src/stm32h5xx_hal_gtzc.c)
3538
zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_HASH drivers/src/stm32h5xx_hal_hash.c)
@@ -42,7 +45,11 @@ zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_I3C drivers/src/stm32h5xx_hal_
4245
zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_ICACHE drivers/src/stm32h5xx_hal_icache.c)
4346
zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_IRDA drivers/src/stm32h5xx_hal_irda.c)
4447
zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_IWDG drivers/src/stm32h5xx_hal_iwdg.c)
48+
zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_JPEG drivers/src/stm32h5xx_hal_jpeg.c)
4549
zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_LPTIM drivers/src/stm32h5xx_hal_lptim.c)
50+
zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_LTDC drivers/src/stm32h5xx_hal_ltdc.c)
51+
zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_LTDC_EX drivers/src/stm32h5xx_hal_ltdc_ex.c)
52+
zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_MDF drivers/src/stm32h5xx_hal_mdf.c)
4653
zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_MMC drivers/src/stm32h5xx_hal_mmc.c)
4754
zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_MMC_EX drivers/src/stm32h5xx_hal_mmc_ex.c)
4855
zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_NAND drivers/src/stm32h5xx_hal_nand.c)
@@ -53,6 +60,7 @@ zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_OTFDEC drivers/src/stm32h5xx_h
5360
zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_PCD drivers/src/stm32h5xx_hal_pcd.c)
5461
zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_PCD_EX drivers/src/stm32h5xx_hal_pcd_ex.c)
5562
zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_PKA drivers/src/stm32h5xx_hal_pka.c)
63+
zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_PLAY drivers/src/stm32h5xx_hal_play.c)
5664
zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_PSSI drivers/src/stm32h5xx_hal_pssi.c)
5765
zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_PWR drivers/src/stm32h5xx_hal_pwr.c)
5866
zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_PWR_EX drivers/src/stm32h5xx_hal_pwr_ex.c)
@@ -90,6 +98,7 @@ zephyr_library_sources_ifdef(CONFIG_USE_STM32_LL_CRS drivers/src/stm32h5xx_ll_cr
9098
zephyr_library_sources_ifdef(CONFIG_USE_STM32_LL_DAC drivers/src/stm32h5xx_ll_dac.c)
9199
zephyr_library_sources_ifdef(CONFIG_USE_STM32_LL_DLYB drivers/src/stm32h5xx_ll_dlyb.c)
92100
zephyr_library_sources_ifdef(CONFIG_USE_STM32_LL_DMA drivers/src/stm32h5xx_ll_dma.c)
101+
zephyr_library_sources_ifdef(CONFIG_USE_STM32_LL_DMA2D drivers/src/stm32h5xx_ll_dma2d.c)
93102
zephyr_library_sources_ifdef(CONFIG_USE_STM32_LL_EXTI drivers/src/stm32h5xx_ll_exti.c)
94103
zephyr_library_sources_ifdef(CONFIG_USE_STM32_LL_FMAC drivers/src/stm32h5xx_ll_fmac.c)
95104
zephyr_library_sources_ifdef(CONFIG_USE_STM32_LL_FMC drivers/src/stm32h5xx_ll_fmc.c)
@@ -101,6 +110,7 @@ zephyr_library_sources_ifdef(CONFIG_USE_STM32_LL_LPTIM drivers/src/stm32h5xx_ll_
101110
zephyr_library_sources_ifdef(CONFIG_USE_STM32_LL_LPUART drivers/src/stm32h5xx_ll_lpuart.c)
102111
zephyr_library_sources_ifdef(CONFIG_USE_STM32_LL_OPAMP drivers/src/stm32h5xx_ll_opamp.c)
103112
zephyr_library_sources_ifdef(CONFIG_USE_STM32_LL_PKA drivers/src/stm32h5xx_ll_pka.c)
113+
zephyr_library_sources_ifdef(CONFIG_USE_STM32_LL_PLAY drivers/src/stm32h5xx_ll_play.c)
104114
zephyr_library_sources_ifdef(CONFIG_USE_STM32_LL_PWR drivers/src/stm32h5xx_ll_pwr.c)
105115
zephyr_library_sources_ifdef(CONFIG_USE_STM32_LL_RCC drivers/src/stm32h5xx_ll_rcc.c)
106116
zephyr_library_sources_ifdef(CONFIG_USE_STM32_LL_RNG drivers/src/stm32h5xx_ll_rng.c)

stm32cube/stm32h5xx/README

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Origin:
66
http://www.st.com/en/embedded-software/stm32cubeh5.html
77

88
Status:
9-
version v1.5.0
9+
version v1.6.0
1010

1111
Purpose:
1212
ST Microelectronics official MCU package for STM32H5 series.
@@ -23,7 +23,7 @@ URL:
2323
https://github.com/STMicroelectronics/STM32CubeH5
2424

2525
Commit:
26-
047a3e84bc870a5609d2f9f38c74caf20d033403
26+
e25dd1b1d0e8871627e79e2d1453687f0f22835c
2727
Maintained-by:
2828
External
2929

@@ -68,11 +68,11 @@ Patch List:
6868
stm32cube/stm32h5xx/drivers/src/stm32h5xx_hal_sdio.c
6969

7070
*Fix SDIO polling mode data transfer issues
71-
Fixes two related issues in the STM32H5 SDIO driver: incorrect block count calculation
72-
that caused the card to hang, and improper buffer size handling that led to misaligned FIFO writes.
71+
Fixes two related issues in the STM32H5 SDIO driver: incorrect block count calculation
72+
that caused the card to hang, and improper buffer size handling that led to misaligned FIFO writes.
7373
Together, these changes ensure correct and stable data transfer in polling mode.
74-
Impacted file:
75-
stm32cube/stm32h5xx/drivers/src/stm32h5xx_hal_sdio.c
74+
Impacted file:
75+
stm32cube/stm32h5xx/drivers/src/stm32h5xx_hal_sdio.c
7676

7777
*Fix warning about extraneous parentheses when compiling with clang
7878
ST internal bug: 218364

stm32cube/stm32h5xx/drivers/include/Legacy/stm32_hal_legacy.h

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,9 @@ extern "C" {
361361
#if defined(STM32L4R5xx) || defined(STM32L4R9xx) || defined(STM32L4R9xx) || defined(STM32L4S5xx) || \
362362
defined(STM32L4S7xx) || defined(STM32L4S9xx)
363363
#define DMA_REQUEST_DCMI_PSSI DMA_REQUEST_DCMI
364-
#endif
364+
#elif defined(STM32L4P5xx) || defined(STM32L4Q5xx)
365+
#define DMA_REQUEST_PSSI DMA_REQUEST_DCMI_PSSI
366+
#endif /* STM32L4R5xx || STM32L4R9xx || STM32L4R9xx || STM32L4S5xx || STM32L4S7xx || STM32L4S9xx */
365367

366368
#endif /* STM32L4 */
367369

@@ -564,6 +566,9 @@ extern "C" {
564566
#define OB_nBOOT0_RESET OB_NBOOT0_RESET
565567
#define OB_nBOOT0_SET OB_NBOOT0_SET
566568
#endif /* STM32U0 */
569+
#if defined(STM32H5)
570+
#define FLASH_ECC_AREA_EDATA FLASH_ECC_AREA_EDATA_BANK1
571+
#endif /* STM32H5 */
567572

568573
/**
569574
* @}
@@ -2025,6 +2030,9 @@ extern "C" {
20252030

20262031
#define PWR_ALL_RAM_RUN_RETENTION_MASK PWR_ALL_RAM_RUN_MASK
20272032
#endif
2033+
#if defined (STM32H7RS)
2034+
#define PWR_SMPS_1V8_SUPPLIES_EXT_AND_LDO PWR_SMPS_1V8_SUPPLIES_EXT_VDD_SUPPLIES_LDO
2035+
#endif
20282036

20292037
/**
20302038
* @}
@@ -2146,6 +2154,13 @@ extern "C" {
21462154
#define UFB_MODE_BitNumber UFB_MODE_BIT_NUMBER
21472155
#define CMP_PD_BitNumber CMP_PD_BIT_NUMBER
21482156

2157+
#if defined(STM32H7RS) || defined(STM32N6)
2158+
#define FMC_SWAPBMAP_DISABLE FMC_SWAPBANK_MODE0
2159+
#define FMC_SWAPBMAP_SDRAM_SRAM FMC_SWAPBANK_MODE1
2160+
#define HAL_SetFMCMemorySwappingConfig HAL_FMC_SetBankSwapConfig
2161+
#define HAL_GetFMCMemorySwappingConfig HAL_FMC_GetBankSwapConfig
2162+
#endif /* STM32H7RS || STM32N6 */
2163+
21492164
/**
21502165
* @}
21512166
*/
@@ -3699,8 +3714,7 @@ extern "C" {
36993714
#endif
37003715

37013716
#if defined(STM32L4) || defined(STM32WB) || defined(STM32G0) || defined(STM32G4) || defined(STM32L5) || \
3702-
defined(STM32WL) || defined(STM32C0) || defined(STM32N6) || defined(STM32H7RS) || \
3703-
defined(STM32U0)
3717+
defined(STM32WL) || defined(STM32C0) || defined(STM32N6) || defined(STM32H7RS) || defined(STM32U0)
37043718
#define RCC_RTCCLKSOURCE_NO_CLK RCC_RTCCLKSOURCE_NONE
37053719
#else
37063720
#define RCC_RTCCLKSOURCE_NONE RCC_RTCCLKSOURCE_NO_CLK
@@ -3951,8 +3965,8 @@ extern "C" {
39513965
*/
39523966
#if defined (STM32G0) || defined (STM32L5) || defined (STM32L412xx) || defined (STM32L422xx) || \
39533967
defined (STM32L4P5xx)|| defined (STM32L4Q5xx) || defined (STM32G4) || defined (STM32WL) || defined (STM32U5) || \
3954-
defined (STM32WBA) || defined (STM32H5) || \
3955-
defined (STM32C0) || defined (STM32N6) || defined (STM32H7RS) || defined (STM32U0) || defined (STM32U3)
3968+
defined (STM32U3) || defined (STM32WBA) || defined (STM32H5) || defined (STM32U0) || \
3969+
defined (STM32C0) || defined (STM32N6) || defined (STM32H7RS)
39563970
#else
39573971
#define __HAL_RTC_CLEAR_FLAG __HAL_RTC_EXTI_CLEAR_FLAG
39583972
#endif

stm32cube/stm32h5xx/drivers/include/stm32h5xx_hal.h

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,7 @@ extern HAL_TickFreqTypeDef uwTickFreq;
157157
#define IS_SBS_ETHERNET_CONFIG(CONFIG) (((CONFIG) == SBS_ETH_MII) || \
158158
((CONFIG) == SBS_ETH_RMII))
159159

160+
160161
/**
161162
* @}
162163
*/
@@ -293,6 +294,54 @@ extern HAL_TickFreqTypeDef uwTickFreq;
293294
* @}
294295
*/
295296

297+
#if defined(SBS_OTGHSPHYTUNER2_TXPREEMPAMPTUNE)
298+
/** @defgroup SBS_OTG_PHYTUNER_PreemphasisCurrent OTG PHYTUNER Preemphasis Current
299+
* @{
300+
*/
301+
302+
/** @brief High-speed (HS) transmitter preemphasis current control
303+
*/
304+
#define SBS_OTG_HS_PHY_PREEMP_DISABLED 0x00000000U /*!< HS transmitter preemphasis circuit disabled */
305+
#define SBS_OTG_HS_PHY_PREEMP_1X SBS_OTGHSPHYTUNER2_TXPREEMPAMPTUNE_0 /*!< HS transmitter preemphasis circuit sources 1x preemphasis current */
306+
#define SBS_OTG_HS_PHY_PREEMP_2X SBS_OTGHSPHYTUNER2_TXPREEMPAMPTUNE_1 /*!< HS transmitter preemphasis circuit sources 2x preemphasis current */
307+
#define SBS_OTG_HS_PHY_PREEMP_3X (SBS_OTGHSPHYTUNER2_TXPREEMPAMPTUNE_0 | SBS_OTGHSPHYTUNER2_TXPREEMPAMPTUNE_1) /*!< HS transmitter preemphasis circuit sources 3x preemphasis current */
308+
309+
/**
310+
* @}
311+
*/
312+
#endif /* SBS_OTGHSPHYTUNER2_TXPREEMPAMPTUNE */
313+
314+
#if defined(SBS_OTGHSPHYTUNER2_SQRXTUNE)
315+
/** @defgroup SBS_OTG_PHYTUNER_SquelchThreshold OTG PHYTUNER Squelch Threshold
316+
* @{
317+
*/
318+
319+
/** @brief Squelch threshold adjustment
320+
*/
321+
#define SBS_OTG_HS_PHY_SQUELCH_15PERCENT 0x00000000U /*!< +15% (recommended value) */
322+
#define SBS_OTG_HS_PHY_SQUELCH_0PERCENT (SBS_OTGHSPHYTUNER2_SQRXTUNE_0 | SBS_OTGHSPHYTUNER2_SQRXTUNE_1) /*!< 0% (default value) */
323+
324+
/**
325+
* @}
326+
*/
327+
#endif /* SBS_OTGHSPHYTUNER2_SQRXTUNE */
328+
329+
#if defined(SBS_OTGHSPHYTUNER2_COMPDISTUNE)
330+
/** @defgroup SBS_OTG_PHYTUNER_DisconnectThreshold OTG PHYTUNER Disconnect Threshold
331+
* @{
332+
*/
333+
334+
/** @brief Disconnect threshold adjustment
335+
*/
336+
#define SBS_OTG_HS_PHY_DISCONNECT_5_9PERCENT SBS_OTGHSPHYTUNER2_COMPDISTUNE_1 /*!< +5.9% (recommended value) */
337+
#define SBS_OTG_HS_PHY_DISCONNECT_0PERCENT SBS_OTGHSPHYTUNER2_COMPDISTUNE_0 /*!< 0% (default value) */
338+
339+
/**
340+
* @}
341+
*/
342+
343+
#endif /* SBS_OTGHSPHYTUNER2_COMPDISTUNE */
344+
296345
/**
297346
* @}
298347
*/
@@ -710,6 +759,22 @@ extern HAL_TickFreqTypeDef uwTickFreq;
710759
#define IS_SBS_ATTRIBUTES(__ATTRIBUTES__) (((__ATTRIBUTES__) == SBS_SEC) ||\
711760
((__ATTRIBUTES__) == SBS_NSEC))
712761

762+
#if defined(SBS_OTGHSPHYTUNER2_COMPDISTUNE)
763+
#define IS_SBS_OTGPHY_DISCONNECT(__VALUE__) (((__VALUE__) == SBS_OTG_HS_PHY_DISCONNECT_5_9PERCENT) || \
764+
((__VALUE__) == SBS_OTG_HS_PHY_DISCONNECT_0PERCENT))
765+
#endif /* SBS_OTGHSPHYTUNER2_COMPDISTUNE*/
766+
#if defined(SBS_OTGHSPHYTUNER2_SQRXTUNE)
767+
#define IS_SBS_OTGPHY_SQUELCH(__VALUE__) (((__VALUE__) == SBS_OTG_HS_PHY_SQUELCH_0PERCENT) || \
768+
((__VALUE__) == SBS_OTG_HS_PHY_SQUELCH_15PERCENT))
769+
#endif /* SBS_OTGHSPHYTUNER2_SQRXTUNE */
770+
771+
#if defined(SBS_OTGHSPHYTUNER2_TXPREEMPAMPTUNE)
772+
#define IS_SBS_OTGPHY_PREEMPHASIS(__VALUE__) (((__VALUE__) == SBS_OTG_HS_PHY_PREEMP_DISABLED) || \
773+
((__VALUE__) == SBS_OTG_HS_PHY_PREEMP_1X) || \
774+
((__VALUE__) == SBS_OTG_HS_PHY_PREEMP_2X) || \
775+
((__VALUE__) == SBS_OTG_HS_PHY_PREEMP_3X))
776+
#endif /* SBS_OTGHSPHYTUNER2_TXPREEMPAMPTUNE */
777+
713778
#if defined (__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3U)
714779

715780
#define IS_SBS_LOCK_ITEMS(__ITEM__) ((((__ITEM__) & SBS_MPU_NSEC) == SBS_MPU_NSEC) || \
@@ -839,6 +904,12 @@ uint32_t HAL_SBS_GetPMOSVddIO2CompensationValue(void);
839904
void HAL_SBS_FLASH_EnableECCNMI(void);
840905
void HAL_SBS_FLASH_DisableECCNMI(void);
841906
uint32_t HAL_SBS_FLASH_ECCNMI_IsDisabled(void);
907+
void HAL_SBS_SetOTGPHYDisconnectThreshold(uint32_t DisconnectThreshold);
908+
uint32_t HAL_SBS_GetOTGPHYDisconnectThreshold(void);
909+
void HAL_SBS_SetOTGPHYSquelchThreshold(uint32_t SquelchThreshold);
910+
uint32_t HAL_SBS_GetOTGPHYSquelchThreshold(void);
911+
void HAL_SBS_SetOTGPHYPreemphasisCurrent(uint32_t PreemphasisCurrent);
912+
uint32_t HAL_SBS_GetOTGPHYPreemphasisCurrent(void);
842913

843914
/**
844915
* @}

0 commit comments

Comments
 (0)