Commit fa44367c authored by Abderrahmane Jarmouni's avatar Abderrahmane Jarmouni Committed by Erwan Gouriou
Browse files

stm32cube: stm32h5: critical package version fixes

H5 Cube files first introduced by commit 1e6cac8e were not
the exact files released in v1.0.0 in the upstream GitHub repo. The gap
was not bridged in the update to v1.1.0 by commit 1946a197.
This patch fixes the problem & brings H5 Cube module files up to date
with the upstream Cube repo.

Signed-off-by: default avatarAbderrahmane Jarmouni <abderrahmane.jarmouni-ext@st.com>
parent f2174947
Loading
Loading
Loading
Loading
+1 −11
Changes for stm32cube/stm32h5xx/README: 1 added line, 11 removed lines.
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ Patch List:
   *Var init in LL_I2S_Init
    - In the LL_I2S_Init function, initialisation of the sourceclock to avoid compilation warning.
      Impacted files:
       drivers/include/stm32h5xx_ll_spi.h
       drivers/include/stm32h5xx_ll_spi.c
      ST internal bug : 147754

   *fix to the V2 HAL API to get PTP to work
@@ -63,14 +63,4 @@ Patch List:
     If the CTXT bit is set in the context descriptor then extract the timestamps
     ST internal bug : 161504

   *fix compilation error when instance does not exist on stm32h50x devices
    - Include the stm32h5xx_ll_dlyb.h only if the stm32h5 device has a SDMMC BLYB or OCTOSPI BLYB
    - Include the stm32h5xx_hal_dcache.h only if the stm32h5 device has a DCACHE
    - Include the stm32h5xx_hal_sai.h only if the stm32h5 device has a SAI block A or B
      Impacted files:
       drivers/include/stm32h5xx_ll_dlyb.h
       drivers/include/stm32h5xx_hal_dcache.h
       drivers/include/stm32h5xx_hal_sai.h
      ST internal bug : 166551 166552 166553

   See release_note.html from STM32Cube
+112 −29

File changed.File mode changed from 100755 to 100644.

Preview size limit exceeded, changes collapsed.

+5 −17
Changes for stm32cube/stm32h5xx/drivers/include/stm32h5xx_hal.h: 5 added lines, 17 removed lines.
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@
  ******************************************************************************
  * @attention
  *
  * Copyright (c) 2022 STMicroelectronics.
  * Copyright (c) 2023 STMicroelectronics.
  * All rights reserved.
  *
  * This software is licensed under terms that can be found in the LICENSE file
@@ -105,6 +105,7 @@ extern HAL_TickFreqTypeDef uwTickFreq;
  * @}
  */

#if defined(VREFBUF)
/** @defgroup VREFBUF_VoltageScale VREFBUF Voltage Scale
  * @{
  */
@@ -127,6 +128,7 @@ extern HAL_TickFreqTypeDef uwTickFreq;
/**
  * @}
  */
#endif /* VREFBUF */

/** @defgroup SBS_FastModePlus_GPIO Fast-mode Plus on GPIO
  * @{
@@ -160,22 +162,6 @@ extern HAL_TickFreqTypeDef uwTickFreq;
  */
#endif /* SBS_PMCR_ETH_SEL_PHY */

/** @defgroup SBS_Boostvddsel_Selection  Boost VDD Selection
  * @{
  */
#define SBS_BOOSTVDDSEL_VDDA             ((uint32_t)0x00000000) /*!< Select VDDA as analog switch supply voltage
                                                                     (when BOOSTEN bit is cleared) */
#define SBS_BOOSTVDDSEL_VDD              SBS_PMCR_BOOSTVDDSEL   /*!< Select VDD  as analog switch supply voltage
                                                                     (regardless of BOOSTEN bit) */

#define IS_SBS_BOOSTVDD_SELECTION(BOOSTVDDSEL) (((BOOSTVDDSEL) == SBS_BOOSTVDDSEL_VDDA)        || \
                                                ((BOOSTVDDSEL) == SBS_BOOSTVDDSEL_VDD))

/**
  * @}
  */


/** @defgroup SBS_Memories_Erase_Flag_Status  Memory Erase Flags Status
  * @{
  */
@@ -647,6 +633,7 @@ extern HAL_TickFreqTypeDef uwTickFreq;
                                            ((__CONFIG__) == SBS_BREAK_SRAM_ECC)   || \
                                            ((__CONFIG__) == SBS_BREAK_LOCKUP))

#if defined(VREFBUF)
#define IS_VREFBUF_VOLTAGE_SCALE(__SCALE__)  (((__SCALE__) == VREFBUF_VOLTAGE_SCALE0) || \
                                              ((__SCALE__) == VREFBUF_VOLTAGE_SCALE1) || \
                                              ((__SCALE__) == VREFBUF_VOLTAGE_SCALE2) || \
@@ -656,6 +643,7 @@ extern HAL_TickFreqTypeDef uwTickFreq;
                                               ((__VALUE__) == VREFBUF_HIGH_IMPEDANCE_ENABLE))

#define IS_VREFBUF_TRIMMING(__VALUE__)  (((__VALUE__) > 0U) && ((__VALUE__) <= VREFBUF_CCR_TRIM))
#endif /* VREFBUF*/

#if defined(SBS_FASTMODEPLUS_PB9)
#define IS_SBS_FASTMODEPLUS(__PIN__)    ((((__PIN__) & SBS_FASTMODEPLUS_PB6) == SBS_FASTMODEPLUS_PB6) || \
+1 −2
Changes for stm32cube/stm32h5xx/drivers/include/stm32h5xx_hal_adc.h: 1 added line, 2 removed lines.
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@
  ******************************************************************************
  * @attention
  *
  * Copyright (c) 2022 STMicroelectronics.
  * Copyright (c) 2023 STMicroelectronics.
  * All rights reserved.
  *
  * This software is licensed under terms that can be found in the LICENSE file
@@ -1126,7 +1126,6 @@ out-of-window sample to raise flag or interrupt */

/**
  * @brief Verify the ADC regular conversions external trigger.
  * @param __HANDLE__ ADC handle
  * @param __REGTRIG__ programmed ADC regular conversions external trigger.
  * @retval SET (__REGTRIG__ is a valid value) or RESET (__REGTRIG__ is invalid)
  */
+1 −2
Changes for stm32cube/stm32h5xx/drivers/include/stm32h5xx_hal_adc_ex.h: 1 added line, 2 removed lines.
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@
  ******************************************************************************
  * @attention
  *
  * Copyright (c) 2022 STMicroelectronics.
  * Copyright (c) 2023 STMicroelectronics.
  * All rights reserved.
  *
  * This software is licensed under terms that can be found in the LICENSE file
@@ -898,7 +898,6 @@ typedef struct

/**
  * @brief Verify the ADC injected conversions external trigger.
  * @param __HANDLE__ ADC handle.
  * @param __INJTRIG__ programmed ADC injected conversions external trigger.
  * @retval SET (__INJTRIG__ is a valid value) or RESET (__INJTRIG__ is invalid)
  */
Loading