Commit aad39760 authored by Fabrice DJIATSA's avatar Fabrice DJIATSA Committed by Erwan Gouriou
Browse files

stm32cube: update stm32n6 to cube version V1.2.0 

Update Cube version for STM32N6xx series
on https://github.com/STMicroelectronics
from version v1.0.0
to version v1.2.0

Signed-off-by: default avatarFabrice DJIATSA <fabrice.djiatsa-ext@st.com>
parent 40a57e20

stm32cube/stm32n6xx/CMakeLists.txt

+1 −1
Changes for stm32cube/stm32n6xx/CMakeLists.txt: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -23,8 +23,8 @@ zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_CRYP_EX drivers/src/stm32n6xx_ 
zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_DCMI drivers/src/stm32n6xx_hal_dcmi.c)

zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_DCMIPP drivers/src/stm32n6xx_hal_dcmipp.c)

zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_DMA drivers/src/stm32n6xx_hal_dma.c)

zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_DMA_EX drivers/src/stm32n6xx_hal_dma_ex.c)

zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_DMA2D drivers/src/stm32n6xx_hal_dma2d.c)

zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_DMA_EX drivers/src/stm32n6xx_hal_dma_ex.c)

zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_DTS drivers/src/stm32n6xx_hal_dts.c)

zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_ETH drivers/src/stm32n6xx_hal_eth.c)

zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_ETH_EX drivers/src/stm32n6xx_hal_eth_ex.c)

stm32cube/stm32n6xx/README

+5 −2
Changes for stm32cube/stm32n6xx/README: 5 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ Origin: 
   http://www.st.com/en/embedded-software/stm32cuben6.html



Status:

   version v1.0.0

   version v1.2.0



Purpose:

   ST Microelectronics official MCU package for STM32N6 series.
@@ -23,7 +23,7 @@ URL: 
   https://github.com/STMicroelectronics/STM32CubeN6



Commit:

   7cc0f778f9ed60d2a00ad9ba7794a3e7feaa3596

   85170d2c6eaa438622ed879caa4d7bcc6cc3920d



Maintained-by:

   External
@@ -66,6 +66,7 @@ Patch List: 
    Impacted files:

      stm32cube/stm32n6xx/drivers/src/stm32n6xx_hal_xspi.c

    Internal reference: 212765

    Status : implemented



   *Fix SDIO polling mode data transfer issues

     Fixes two related issues in the STM32N6 SDIO driver: incorrect block count calculation
@@ -73,3 +74,5 @@ Patch List: 
     Together, these changes ensure correct and stable data transfer in polling mode.

     Impacted file:

      stm32cube/stm32n6xx/drivers/src/stm32n6xx_hal_sdio.c



   See release_note.html from STM32Cube

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

+14 −7
Changes for stm32cube/stm32n6xx/drivers/include/Legacy/stm32_hal_legacy.h: 14 added lines, 7 removed lines.
Original line number Diff line number Diff line
@@ -472,9 +472,9 @@ extern "C" { 
#define TYPEPROGRAMDATA_FASTBYTE      FLASH_TYPEPROGRAMDATA_FASTBYTE

#define TYPEPROGRAMDATA_FASTHALFWORD  FLASH_TYPEPROGRAMDATA_FASTHALFWORD

#define TYPEPROGRAMDATA_FASTWORD      FLASH_TYPEPROGRAMDATA_FASTWORD

#if !defined(STM32F2) && !defined(STM32F4) && !defined(STM32F7) && !defined(STM32H7)

#if !defined(STM32F2) && !defined(STM32F4) && !defined(STM32F7) && !defined(STM32H7) && !defined(STM32H5)

/* #define PAGESIZE                      FLASH_PAGE_SIZE */

#endif /* STM32F2 && STM32F4 && STM32F7 &&  STM32H7 */

#endif /* STM32F2 && STM32F4 && STM32F7 &&  STM32H7 && STM32H5 */

#define TYPEPROGRAM_FASTBYTE          FLASH_TYPEPROGRAM_BYTE

#define TYPEPROGRAM_FASTHALFWORD      FLASH_TYPEPROGRAM_HALFWORD

#define TYPEPROGRAM_FASTWORD          FLASH_TYPEPROGRAM_WORD
@@ -538,6 +538,10 @@ extern "C" { 
#define FLASH_FLAG_WDW                FLASH_FLAG_WBNE

#define OB_WRP_SECTOR_All             OB_WRP_SECTOR_ALL

#endif /* STM32H7 */

#if defined(STM32H7RS)

#define FLASH_OPTKEY1                 FLASH_OPT_KEY1

#define FLASH_OPTKEY2                 FLASH_OPT_KEY2

#endif /* STM32H7RS */

#if defined(STM32U5)

#define OB_USER_nRST_STOP             OB_USER_NRST_STOP

#define OB_USER_nRST_STDBY            OB_USER_NRST_STDBY
@@ -560,6 +564,9 @@ extern "C" { 
#define OB_nBOOT0_RESET               OB_NBOOT0_RESET

#define OB_nBOOT0_SET                 OB_NBOOT0_SET

#endif /* STM32U0 */

#if defined(STM32H5)

#define FLASH_ECC_AREA_EDATA          FLASH_ECC_AREA_EDATA_BANK1

#endif /* STM32H5 */



/**

  * @}
@@ -1299,22 +1306,22 @@ extern "C" { 
#define TAMP_SECRETDEVICE_ERASE_ENABLE      TAMP_SECRETDEVICE_ERASE_ALL

#endif /* STM32H5 || STM32WBA || STM32H7RS ||  STM32N6 */



#if defined(STM32F7)

#if defined(STM32F7) || defined(STM32WB)

#define RTC_TAMPCR_TAMPXE          RTC_TAMPER_ENABLE_BITS_MASK

#define RTC_TAMPCR_TAMPXIE         RTC_TAMPER_IT_ENABLE_BITS_MASK

#endif /* STM32F7 */

#endif /* STM32F7 || STM32WB */



#if defined(STM32H7)

#define RTC_TAMPCR_TAMPXE          RTC_TAMPER_X

#define RTC_TAMPCR_TAMPXIE         RTC_TAMPER_X_INTERRUPT

#endif /* STM32H7 */



#if defined(STM32F7) || defined(STM32H7) || defined(STM32L0)

#if defined(STM32F7) || defined(STM32H7) || defined(STM32L0) || defined(STM32WB)

#define RTC_TAMPER1_INTERRUPT      RTC_IT_TAMP1

#define RTC_TAMPER2_INTERRUPT      RTC_IT_TAMP2

#define RTC_TAMPER3_INTERRUPT      RTC_IT_TAMP3

#define RTC_ALL_TAMPER_INTERRUPT   RTC_IT_TAMP

#endif /* STM32F7 || STM32H7 || STM32L0 */

#endif /* STM32F7 || STM32H7 || STM32L0 || STM32WB */



/**

  * @}
@@ -3948,7 +3955,7 @@ extern "C" { 
#if defined (STM32G0) || defined (STM32L5) || defined (STM32L412xx) || defined (STM32L422xx) || \

    defined (STM32L4P5xx)|| defined (STM32L4Q5xx) || defined (STM32G4) || defined (STM32WL) || defined (STM32U5) || \

    defined (STM32WBA) || defined (STM32H5) || \

    defined (STM32C0) || defined (STM32N6) || defined (STM32H7RS) ||  defined (STM32U0)

    defined (STM32C0) || defined (STM32N6) || defined (STM32H7RS) || defined (STM32U0) || defined (STM32U3)

#else

#define __HAL_RTC_CLEAR_FLAG                      __HAL_RTC_EXTI_CLEAR_FLAG

#endif

stm32cube/stm32n6xx/drivers/include/stm32n6xx_hal.h

+4 −4
Changes for stm32cube/stm32n6xx/drivers/include/stm32n6xx_hal.h: 4 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -78,10 +78,10 @@ extern HAL_TickFreqTypeDef uwTickFreq; 
/**

  * @brief STM32N6xx HAL Driver version number

  */

#define __STM32N6xx_HAL_VERSION_MAIN   (0x01U) /*!< [31:24] main version */

#define __STM32N6xx_HAL_VERSION_SUB1   (0x00U) /*!< [23:16] sub1 version */

#define __STM32N6xx_HAL_VERSION_SUB2   (0x00U) /*!< [15:8]  sub2 version */

#define __STM32N6xx_HAL_VERSION_RC     (0x00U) /*!< [7:0]  release candidate */

#define __STM32N6xx_HAL_VERSION_MAIN   (0x01UL) /*!< [31:24] main version */

#define __STM32N6xx_HAL_VERSION_SUB1   (0x02UL) /*!< [23:16] sub1 version */

#define __STM32N6xx_HAL_VERSION_SUB2   (0x00UL) /*!< [15:8]  sub2 version */

#define __STM32N6xx_HAL_VERSION_RC     (0x00UL) /*!< [7:0]  release candidate */

#define __STM32N6xx_HAL_VERSION         ((__STM32N6xx_HAL_VERSION_MAIN << 24U)  \

                                         |(__STM32N6xx_HAL_VERSION_SUB1 << 16U) \

                                         |(__STM32N6xx_HAL_VERSION_SUB2 << 8U ) \

stm32cube/stm32n6xx/drivers/include/stm32n6xx_hal_adc.h

+2 −34
Changes for stm32cube/stm32n6xx/drivers/include/stm32n6xx_hal_adc.h: 2 added lines, 34 removed lines.
Original line number Diff line number Diff line
@@ -1689,8 +1689,7 @@ __LL_ADC_CONVERT_DATA_RESOLUTION((__DATA__),\ 
  * @brief  Helper macro to calculate the voltage (unit: mVolt)

  *         corresponding to a ADC conversion data (unit: digital value).

  * @note   Analog reference voltage (Vref+) must be either known from

  *         user board environment or can be calculated using ADC measurement

  *         and ADC helper macro @ref __LL_ADC_CALC_VREFANALOG_VOLTAGE().

  *         user board environment.

  * @param  __VREFANALOG_VOLTAGE__ Analog reference voltage (unit: mV)

  * @param  __ADC_DATA__ ADC conversion data (resolution 12 bits)

  *                       (unit: digital value).
@@ -1713,8 +1712,7 @@ __LL_ADC_CALC_DATA_TO_VOLTAGE((__VREFANALOG_VOLTAGE__),\ 
  *         corresponding to a ADC conversion data (unit: digital value)

  *         in differential ended mode.

  * @note   Analog reference voltage (Vref+) must be either known from

  *         user board environment or can be calculated using ADC measurement

  *         and ADC helper macro @ref __LL_ADC_CALC_VREFANALOG_VOLTAGE().

  *         user board environment.

  * @param  __VREFANALOG_VOLTAGE__ Analog reference voltage (unit: mV)

  * @param  __ADC_DATA__ ADC conversion data (resolution 12 bits)

  *                       (unit: digital value).
@@ -1732,36 +1730,6 @@ __LL_ADC_CALC_DIFF_DATA_TO_VOLTAGE((__VREFANALOG_VOLTAGE__),\ 
                                   (__ADC_DATA__),\

                                   (__ADC_RESOLUTION__))



/**

  * @brief  Helper macro to calculate analog reference voltage (Vref+)

  *         (unit: mVolt) from ADC conversion data of internal voltage

  *         reference VrefInt.

  * @note   Computation is using VrefInt calibration value

  *         stored in system memory for each device during production.

  * @note   This voltage depends on user board environment: voltage level

  *         connected to pin Vref+.

  *         On devices with small package, the pin Vref+ is not present

  *         and internally bonded to pin Vdda.

  * @note   On this STM32 series, calibration data of internal voltage reference

  *         VrefInt corresponds to a resolution of 12 bits,

  *         this is the recommended ADC resolution to convert voltage of

  *         internal voltage reference VrefInt.

  *         Otherwise, this macro performs the processing to scale

  *         ADC conversion data to 12 bits.

  * @param  __VREFINT_ADC_DATA__ ADC conversion data (resolution 12 bits)

  *         of internal voltage reference VrefInt (unit: digital value).

  * @param  __ADC_RESOLUTION__ This parameter can be one of the following values:

  *         @arg @ref ADC_RESOLUTION_12B

  *         @arg @ref ADC_RESOLUTION_10B

  *         @arg @ref ADC_RESOLUTION_8B

  *         @arg @ref ADC_RESOLUTION_6B

  * @retval Analog reference voltage (unit: mV)

  */

#define __HAL_ADC_CALC_VREFANALOG_VOLTAGE(__VREFINT_ADC_DATA__,\

                                          __ADC_RESOLUTION__) \

__LL_ADC_CALC_VREFANALOG_VOLTAGE((__VREFINT_ADC_DATA__),\

                                 (__ADC_RESOLUTION__))





/**

  * @}

CRA Git | Maintained and supported by SUSTech CRA and CCSE