Skip to content

Commit ae7b3b5

Browse files
djiatsaf-stdjiatsaf-st
committed
stm32cube: update stm32n6 to cube version V1.1.0
Update Cube version for STM32N6xx series on https://github.com/STMicroelectronics from version v1.0.0 to version v1.1.0 Signed-off-by: Fabrice DJIATSA <[email protected]>
1 parent b72c556 commit ae7b3b5

Some content is hidden

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

48 files changed

+486
-578
lines changed

‎stm32cube/stm32n6xx/CMakeLists.txt‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
# Copyright (c) 2025 STMicroelectronics
1+
# Copyright (c) 2020 STMicroelectronics
22
#
33
# SPDX-License-Identifier: Apache-2.0
44

5-
zephyr_library_sources(soc/system_stm32n6xx_fsbl.c)
5+
zephyr_library_sources(soc/system_stm32n6xx.c)
66
zephyr_library_sources(drivers/src/stm32n6xx_hal.c)
77
zephyr_library_sources(drivers/src/stm32n6xx_hal_rcc.c)
88
zephyr_library_sources(drivers/src/stm32n6xx_hal_rcc_ex.c)
@@ -18,8 +18,8 @@ zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_CRYP_EX drivers/src/stm32n6xx_
1818
zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_DCMI drivers/src/stm32n6xx_hal_dcmi.c)
1919
zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_DCMIPP drivers/src/stm32n6xx_hal_dcmipp.c)
2020
zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_DMA drivers/src/stm32n6xx_hal_dma.c)
21-
zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_DMA_EX drivers/src/stm32n6xx_hal_dma_ex.c)
2221
zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_DMA2D drivers/src/stm32n6xx_hal_dma2d.c)
22+
zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_DMA_EX drivers/src/stm32n6xx_hal_dma_ex.c)
2323
zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_DTS drivers/src/stm32n6xx_hal_dts.c)
2424
zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_ETH drivers/src/stm32n6xx_hal_eth.c)
2525
zephyr_library_sources_ifdef(CONFIG_USE_STM32_HAL_ETH_EX drivers/src/stm32n6xx_hal_eth_ex.c)
@@ -109,4 +109,3 @@ zephyr_library_sources_ifdef(CONFIG_USE_STM32_LL_USART drivers/src/stm32n6xx_ll_
109109
zephyr_library_sources_ifdef(CONFIG_USE_STM32_LL_USB drivers/src/stm32n6xx_ll_usb.c)
110110
zephyr_library_sources_ifdef(CONFIG_USE_STM32_LL_UTILS drivers/src/stm32n6xx_ll_utils.c)
111111
zephyr_library_sources_ifdef(CONFIG_USE_STM32_LL_VENC drivers/src/stm32n6xx_ll_venc.c)
112-
zephyr_library_sources_ifdef(CONFIG_USE_STM32_UTIL_I3C drivers/src/stm32n6xx_util_i3c.c)

‎stm32cube/stm32n6xx/README‎

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

88
Status:
9-
version v1.0.0
9+
version v1.1.0
1010

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

2525
Commit:
26-
7cc0f778f9ed60d2a00ad9ba7794a3e7feaa3596
26+
6bacd534fd36eb7cf9a8a16196b97b7faac72dfb
2727

2828
Maintained-by:
2929
External

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

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -472,9 +472,9 @@ extern "C" {
472472
#define TYPEPROGRAMDATA_FASTBYTE FLASH_TYPEPROGRAMDATA_FASTBYTE
473473
#define TYPEPROGRAMDATA_FASTHALFWORD FLASH_TYPEPROGRAMDATA_FASTHALFWORD
474474
#define TYPEPROGRAMDATA_FASTWORD FLASH_TYPEPROGRAMDATA_FASTWORD
475-
#if !defined(STM32F2) && !defined(STM32F4) && !defined(STM32F7) && !defined(STM32H7)
475+
#if !defined(STM32F2) && !defined(STM32F4) && !defined(STM32F7) && !defined(STM32H7) && !defined(STM32H5)
476476
/* #define PAGESIZE FLASH_PAGE_SIZE */
477-
#endif /* STM32F2 && STM32F4 && STM32F7 && STM32H7 */
477+
#endif /* STM32F2 && STM32F4 && STM32F7 && STM32H7 && STM32H5 */
478478
#define TYPEPROGRAM_FASTBYTE FLASH_TYPEPROGRAM_BYTE
479479
#define TYPEPROGRAM_FASTHALFWORD FLASH_TYPEPROGRAM_HALFWORD
480480
#define TYPEPROGRAM_FASTWORD FLASH_TYPEPROGRAM_WORD
@@ -538,6 +538,10 @@ extern "C" {
538538
#define FLASH_FLAG_WDW FLASH_FLAG_WBNE
539539
#define OB_WRP_SECTOR_All OB_WRP_SECTOR_ALL
540540
#endif /* STM32H7 */
541+
#if defined(STM32H7RS)
542+
#define FLASH_OPTKEY1 FLASH_OPT_KEY1
543+
#define FLASH_OPTKEY2 FLASH_OPT_KEY2
544+
#endif /* STM32H7RS */
541545
#if defined(STM32U5)
542546
#define OB_USER_nRST_STOP OB_USER_NRST_STOP
543547
#define OB_USER_nRST_STDBY OB_USER_NRST_STDBY
@@ -1299,22 +1303,22 @@ extern "C" {
12991303
#define TAMP_SECRETDEVICE_ERASE_ENABLE TAMP_SECRETDEVICE_ERASE_ALL
13001304
#endif /* STM32H5 || STM32WBA || STM32H7RS || STM32N6 */
13011305

1302-
#if defined(STM32F7)
1306+
#if defined(STM32F7) || defined(STM32WB)
13031307
#define RTC_TAMPCR_TAMPXE RTC_TAMPER_ENABLE_BITS_MASK
13041308
#define RTC_TAMPCR_TAMPXIE RTC_TAMPER_IT_ENABLE_BITS_MASK
1305-
#endif /* STM32F7 */
1309+
#endif /* STM32F7 || STM32WB */
13061310

13071311
#if defined(STM32H7)
13081312
#define RTC_TAMPCR_TAMPXE RTC_TAMPER_X
13091313
#define RTC_TAMPCR_TAMPXIE RTC_TAMPER_X_INTERRUPT
13101314
#endif /* STM32H7 */
13111315

1312-
#if defined(STM32F7) || defined(STM32H7) || defined(STM32L0)
1316+
#if defined(STM32F7) || defined(STM32H7) || defined(STM32L0) || defined(STM32WB)
13131317
#define RTC_TAMPER1_INTERRUPT RTC_IT_TAMP1
13141318
#define RTC_TAMPER2_INTERRUPT RTC_IT_TAMP2
13151319
#define RTC_TAMPER3_INTERRUPT RTC_IT_TAMP3
13161320
#define RTC_ALL_TAMPER_INTERRUPT RTC_IT_TAMP
1317-
#endif /* STM32F7 || STM32H7 || STM32L0 */
1321+
#endif /* STM32F7 || STM32H7 || STM32L0 || STM32WB */
13181322

13191323
/**
13201324
* @}
@@ -3948,7 +3952,7 @@ extern "C" {
39483952
#if defined (STM32G0) || defined (STM32L5) || defined (STM32L412xx) || defined (STM32L422xx) || \
39493953
defined (STM32L4P5xx)|| defined (STM32L4Q5xx) || defined (STM32G4) || defined (STM32WL) || defined (STM32U5) || \
39503954
defined (STM32WBA) || defined (STM32H5) || \
3951-
defined (STM32C0) || defined (STM32N6) || defined (STM32H7RS) || defined (STM32U0)
3955+
defined (STM32C0) || defined (STM32N6) || defined (STM32H7RS) || defined (STM32U0) || defined (STM32U3)
39523956
#else
39533957
#define __HAL_RTC_CLEAR_FLAG __HAL_RTC_EXTI_CLEAR_FLAG
39543958
#endif

‎stm32cube/stm32n6xx/drivers/include/stm32n6xx_hal.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ extern HAL_TickFreqTypeDef uwTickFreq;
7979
* @brief STM32N6xx HAL Driver version number
8080
*/
8181
#define __STM32N6xx_HAL_VERSION_MAIN (0x01U) /*!< [31:24] main version */
82-
#define __STM32N6xx_HAL_VERSION_SUB1 (0x00U) /*!< [23:16] sub1 version */
82+
#define __STM32N6xx_HAL_VERSION_SUB1 (0x01U) /*!< [23:16] sub1 version */
8383
#define __STM32N6xx_HAL_VERSION_SUB2 (0x00U) /*!< [15:8] sub2 version */
8484
#define __STM32N6xx_HAL_VERSION_RC (0x00U) /*!< [7:0] release candidate */
8585
#define __STM32N6xx_HAL_VERSION ((__STM32N6xx_HAL_VERSION_MAIN << 24U) \

‎stm32cube/stm32n6xx/drivers/include/stm32n6xx_hal_adc.h‎

Lines changed: 2 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1689,8 +1689,7 @@ __LL_ADC_CONVERT_DATA_RESOLUTION((__DATA__),\
16891689
* @brief Helper macro to calculate the voltage (unit: mVolt)
16901690
* corresponding to a ADC conversion data (unit: digital value).
16911691
* @note Analog reference voltage (Vref+) must be either known from
1692-
* user board environment or can be calculated using ADC measurement
1693-
* and ADC helper macro @ref __LL_ADC_CALC_VREFANALOG_VOLTAGE().
1692+
* user board environment.
16941693
* @param __VREFANALOG_VOLTAGE__ Analog reference voltage (unit: mV)
16951694
* @param __ADC_DATA__ ADC conversion data (resolution 12 bits)
16961695
* (unit: digital value).
@@ -1713,8 +1712,7 @@ __LL_ADC_CALC_DATA_TO_VOLTAGE((__VREFANALOG_VOLTAGE__),\
17131712
* corresponding to a ADC conversion data (unit: digital value)
17141713
* in differential ended mode.
17151714
* @note Analog reference voltage (Vref+) must be either known from
1716-
* user board environment or can be calculated using ADC measurement
1717-
* and ADC helper macro @ref __LL_ADC_CALC_VREFANALOG_VOLTAGE().
1715+
* user board environment.
17181716
* @param __VREFANALOG_VOLTAGE__ Analog reference voltage (unit: mV)
17191717
* @param __ADC_DATA__ ADC conversion data (resolution 12 bits)
17201718
* (unit: digital value).
@@ -1732,36 +1730,6 @@ __LL_ADC_CALC_DIFF_DATA_TO_VOLTAGE((__VREFANALOG_VOLTAGE__),\
17321730
(__ADC_DATA__),\
17331731
(__ADC_RESOLUTION__))
17341732

1735-
/**
1736-
* @brief Helper macro to calculate analog reference voltage (Vref+)
1737-
* (unit: mVolt) from ADC conversion data of internal voltage
1738-
* reference VrefInt.
1739-
* @note Computation is using VrefInt calibration value
1740-
* stored in system memory for each device during production.
1741-
* @note This voltage depends on user board environment: voltage level
1742-
* connected to pin Vref+.
1743-
* On devices with small package, the pin Vref+ is not present
1744-
* and internally bonded to pin Vdda.
1745-
* @note On this STM32 series, calibration data of internal voltage reference
1746-
* VrefInt corresponds to a resolution of 12 bits,
1747-
* this is the recommended ADC resolution to convert voltage of
1748-
* internal voltage reference VrefInt.
1749-
* Otherwise, this macro performs the processing to scale
1750-
* ADC conversion data to 12 bits.
1751-
* @param __VREFINT_ADC_DATA__ ADC conversion data (resolution 12 bits)
1752-
* of internal voltage reference VrefInt (unit: digital value).
1753-
* @param __ADC_RESOLUTION__ This parameter can be one of the following values:
1754-
* @arg @ref ADC_RESOLUTION_12B
1755-
* @arg @ref ADC_RESOLUTION_10B
1756-
* @arg @ref ADC_RESOLUTION_8B
1757-
* @arg @ref ADC_RESOLUTION_6B
1758-
* @retval Analog reference voltage (unit: mV)
1759-
*/
1760-
#define __HAL_ADC_CALC_VREFANALOG_VOLTAGE(__VREFINT_ADC_DATA__,\
1761-
__ADC_RESOLUTION__) \
1762-
__LL_ADC_CALC_VREFANALOG_VOLTAGE((__VREFINT_ADC_DATA__),\
1763-
(__ADC_RESOLUTION__))
1764-
17651733

17661734
/**
17671735
* @}

‎stm32cube/stm32n6xx/drivers/include/stm32n6xx_hal_conf.h‎

Lines changed: 62 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -34,59 +34,60 @@
3434
* @brief This is the list of modules to be used in the HAL driver
3535
*/
3636
#define HAL_MODULE_ENABLED
37-
#define HAL_ADC_MODULE_ENABLED
38-
#define HAL_BSEC_MODULE_ENABLED
39-
#define HAL_CRC_MODULE_ENABLED
40-
#define HAL_CRYP_MODULE_ENABLED
41-
#define HAL_DCMI_MODULE_ENABLED
42-
#define HAL_DCMIPP_MODULE_ENABLED
43-
#define HAL_DMA2D_MODULE_ENABLED
44-
#define HAL_DTS_MODULE_ENABLED
45-
#define HAL_ETH_MODULE_ENABLED
46-
#define HAL_EXTI_MODULE_ENABLED
47-
#define HAL_FDCAN_MODULE_ENABLED
48-
#define HAL_GFXMMU_MODULE_ENABLED
49-
#define HAL_GFXTIM_MODULE_ENABLED
50-
#define HAL_HASH_MODULE_ENABLED
51-
#define HAL_HCD_MODULE_ENABLED
52-
#define HAL_I2C_MODULE_ENABLED
53-
#define HAL_I2S_MODULE_ENABLED
54-
#define HAL_I3C_MODULE_ENABLED
55-
#define HAL_ICACHE_MODULE_ENABLED
56-
#define HAL_IRDA_MODULE_ENABLED
57-
#define HAL_IWDG_MODULE_ENABLED
58-
#define HAL_JPEG_MODULE_ENABLED
59-
#define HAL_LPTIM_MODULE_ENABLED
60-
#define HAL_LTDC_MODULE_ENABLED
61-
#define HAL_MCE_MODULE_ENABLED
62-
#define HAL_MDF_MODULE_ENABLED
63-
#define HAL_MMC_MODULE_ENABLED
64-
#define HAL_NAND_MODULE_ENABLED
65-
#define HAL_NOR_MODULE_ENABLED
66-
#define HAL_PCD_MODULE_ENABLED
67-
#define HAL_PKA_MODULE_ENABLED
68-
#define HAL_PSSI_MODULE_ENABLED
69-
#define HAL_RAMCFG_MODULE_ENABLED
70-
#define HAL_RIF_MODULE_ENABLED
71-
#define HAL_RNG_MODULE_ENABLED
72-
#define HAL_RTC_MODULE_ENABLED
73-
#define HAL_SAI_MODULE_ENABLED
74-
#define HAL_SD_MODULE_ENABLED
75-
#define HAL_SDRAM_MODULE_ENABLED
37+
#define HAL_ADC_MODULE_ENABLED
38+
#define HAL_BSEC_MODULE_ENABLED
39+
#define HAL_CRC_MODULE_ENABLED
40+
#define HAL_CRYP_MODULE_ENABLED
41+
#define HAL_DCMI_MODULE_ENABLED
42+
#define HAL_DCMIPP_MODULE_ENABLED
43+
#define HAL_DMA2D_MODULE_ENABLED
44+
#define HAL_DTS_MODULE_ENABLED
45+
#define HAL_ETH_MODULE_ENABLED
46+
#define HAL_EXTI_MODULE_ENABLED
47+
#define HAL_FDCAN_MODULE_ENABLED
48+
#define HAL_GFXMMU_MODULE_ENABLED
49+
#define HAL_GFXTIM_MODULE_ENABLED
50+
#define HAL_HASH_MODULE_ENABLED
51+
#define HAL_HCD_MODULE_ENABLED
52+
#define HAL_I2C_MODULE_ENABLED
53+
#define HAL_I2S_MODULE_ENABLED
54+
#define HAL_I3C_MODULE_ENABLED
55+
#define HAL_ICACHE_MODULE_ENABLED
56+
#define HAL_IRDA_MODULE_ENABLED
57+
#define HAL_IWDG_MODULE_ENABLED
58+
#define HAL_JPEG_MODULE_ENABLED
59+
#define HAL_LPTIM_MODULE_ENABLED
60+
#define HAL_LTDC_MODULE_ENABLED
61+
#define HAL_MCE_MODULE_ENABLED
62+
#define HAL_MDF_MODULE_ENABLED
63+
#define HAL_MMC_MODULE_ENABLED
64+
#define HAL_NAND_MODULE_ENABLED
65+
#define HAL_NOR_MODULE_ENABLED
66+
#define HAL_PCD_MODULE_ENABLED
67+
#define HAL_PKA_MODULE_ENABLED
68+
#define HAL_PSSI_MODULE_ENABLED
69+
#define HAL_RAMCFG_MODULE_ENABLED
70+
#define HAL_RIF_MODULE_ENABLED
71+
#define HAL_RNG_MODULE_ENABLED
72+
#define HAL_RTC_MODULE_ENABLED
73+
#define HAL_SAI_MODULE_ENABLED
74+
#define HAL_SD_MODULE_ENABLED
75+
#define HAL_SDIO_MODULE_ENABLED
76+
#define HAL_SDRAM_MODULE_ENABLED
7677
#define HAL_SMARTCARD_MODULE_ENABLED
77-
#define HAL_SMBUS_MODULE_ENABLED
78-
#define HAL_SPDIFRX_MODULE_ENABLED
79-
#define HAL_SPI_MODULE_ENABLED
80-
#define HAL_SRAM_MODULE_ENABLED
81-
#define HAL_TIM_MODULE_ENABLED
82-
#define HAL_UART_MODULE_ENABLED
83-
#define HAL_USART_MODULE_ENABLED
84-
#define HAL_WWDG_MODULE_ENABLED
85-
#define HAL_XSPI_MODULE_ENABLED
86-
#define HAL_CACHEAXI_MODULE_ENABLED
87-
#define HAL_MDIOS_MODULE_ENABLED
88-
#define HAL_GPU2D_MODULE_ENABLED
89-
#define HAL_CACHEAXI_MODULE_ENABLED
78+
#define HAL_SMBUS_MODULE_ENABLED
79+
#define HAL_SPDIFRX_MODULE_ENABLED
80+
#define HAL_SPI_MODULE_ENABLED
81+
#define HAL_SRAM_MODULE_ENABLED
82+
#define HAL_TIM_MODULE_ENABLED
83+
#define HAL_UART_MODULE_ENABLED
84+
#define HAL_USART_MODULE_ENABLED
85+
#define HAL_WWDG_MODULE_ENABLED
86+
#define HAL_XSPI_MODULE_ENABLED
87+
#define HAL_CACHEAXI_MODULE_ENABLED
88+
#define HAL_MDIOS_MODULE_ENABLED
89+
#define HAL_GPU2D_MODULE_ENABLED
90+
#define HAL_CACHEAXI_MODULE_ENABLED
9091
#define HAL_GPIO_MODULE_ENABLED
9192
#define HAL_EXTI_MODULE_ENABLED
9293
#define HAL_DMA_MODULE_ENABLED
@@ -206,6 +207,7 @@
206207
#define USE_HAL_RTC_REGISTER_CALLBACKS 0U /* RTC register callback disabled */
207208
#define USE_HAL_SAI_REGISTER_CALLBACKS 0U /* SAI register callback disabled */
208209
#define USE_HAL_SD_REGISTER_CALLBACKS 0U /* SD register callback disabled */
210+
#define USE_HAL_SDIO_REGISTER_CALLBACKS 0U /* SDIO register callback disabled */
209211
#define USE_HAL_SDRAM_REGISTER_CALLBACKS 0U /* SDRAM register callback disabled */
210212
#define USE_HAL_SMARTCARD_REGISTER_CALLBACKS 0U /* SMARTCARD register callback disabled */
211213
#define USE_HAL_SMBUS_REGISTER_CALLBACKS 0U /* SMBUS register callback disabled */
@@ -230,6 +232,10 @@
230232

231233
#define USE_SD_TRANSCEIVER 0U
232234

235+
/* ################## SDIO peripheral configuration ########################## */
236+
#define USE_SDIO_TRANSCEIVER 1U
237+
#define SDIO_MAX_IO_NUMBER 7U /*!< SDIO device support maximum IO number */
238+
233239
/* Includes ------------------------------------------------------------------*/
234240
/**
235241
* @brief Include module's header file
@@ -426,6 +432,10 @@
426432
#include "stm32n6xx_hal_sd.h"
427433
#endif /* HAL_SD_MODULE_ENABLED */
428434

435+
#ifdef HAL_SDIO_MODULE_ENABLED
436+
#include "stm32n6xx_hal_sdio.h"
437+
#endif /* HAL_SDIO_MODULE_ENABLED */
438+
429439
#ifdef HAL_SDRAM_MODULE_ENABLED
430440
#include "stm32n6xx_hal_sdram.h"
431441
#endif /* HAL_SDRAM_MODULE_ENABLED */

‎stm32cube/stm32n6xx/drivers/include/stm32n6xx_hal_cortex.h‎

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,14 +51,16 @@ typedef struct
5151
This parameter can be a value of @ref CORTEX_MPU_Region_Enable */
5252
uint8_t Number; /*!< Specifies the number of the region to protect.
5353
This parameter can be a value of @ref CORTEX_MPU_Region_Number */
54-
uint32_t BaseAddress; /*!< Specifies the base address of the region to protect. */
55-
uint32_t LimitAddress; /*!< Specifies the limit address of the region to protect. */
5654
uint8_t AttributesIndex; /*!< Specifies the memory attributes index.
5755
This parameter can be a value of @ref CORTEX_MPU_Attributes_Number */
56+
uint32_t BaseAddress; /*!< Specifies the base address of the region to protect. */
57+
uint32_t LimitAddress; /*!< Specifies the limit address of the region to protect. */
5858
uint8_t AccessPermission; /*!< Specifies the region access permission type.
5959
This parameter can be a value of @ref CORTEX_MPU_Region_Permission_Attributes */
6060
uint8_t DisableExec; /*!< Specifies the instruction access status.
6161
This parameter can be a value of @ref CORTEX_MPU_Instruction_Access */
62+
uint8_t DisablePrivExec; /*!< Specifies if privileged software can execute instructions from this region.
63+
This parameter can be a value of @ref CORTEX_MPU_Priv_Instruction_Access */
6264
uint8_t IsShareable; /*!< Specifies the shareability status of the protected region.
6365
This parameter can be a value of @ref CORTEX_MPU_Access_Shareable */
6466
} MPU_Region_InitTypeDef;
@@ -75,7 +77,7 @@ typedef struct
7577
This parameter can be a value of @ref CORTEX_MPU_Attributes_Number */
7678

7779
uint8_t Attributes; /*!< Specifies the memory attributes vue.
78-
This parameter must be a number between Min_Data = 0x0 and Max_Data = 0xFFFF */
80+
This parameter can be a value of @ref CORTEX_MPU_Attributes */
7981

8082
} MPU_Attributes_InitTypeDef;
8183
/**
@@ -148,6 +150,15 @@ typedef struct
148150
* @}
149151
*/
150152

153+
/** @defgroup CORTEX_MPU_Priv_Instruction_Access CORTEX MPU Privileged Instruction Access
154+
* @{
155+
*/
156+
#define MPU_PRIV_INSTRUCTION_ACCESS_ENABLE 0U
157+
#define MPU_PRIV_INSTRUCTION_ACCESS_DISABLE 1U
158+
/**
159+
* @}
160+
*/
161+
151162
/** @defgroup CORTEX_MPU_Access_Shareable CORTEX MPU Instruction Access Shareable
152163
* @{
153164
*/
@@ -352,6 +363,9 @@ void HAL_MPU_ConfigMemoryAttributes_NS(const MPU_Attributes_InitTypeDef *pMPU_At
352363
#define IS_MPU_INSTRUCTION_ACCESS(__STATE__) (((__STATE__) == MPU_INSTRUCTION_ACCESS_ENABLE) || \
353364
((__STATE__) == MPU_INSTRUCTION_ACCESS_DISABLE))
354365

366+
#define IS_MPU_PRIV_INSTRUCTION_ACCESS(__STATE__) (((__STATE__) == MPU_PRIV_INSTRUCTION_ACCESS_ENABLE) || \
367+
((__STATE__) == MPU_PRIV_INSTRUCTION_ACCESS_DISABLE))
368+
355369
#define IS_MPU_ACCESS_SHAREABLE(__STATE__) (((__STATE__) == MPU_ACCESS_OUTER_SHAREABLE) || \
356370
((__STATE__) == MPU_ACCESS_INNER_SHAREABLE) || \
357371
((__STATE__) == MPU_ACCESS_NOT_SHAREABLE))

‎stm32cube/stm32n6xx/drivers/include/stm32n6xx_hal_cryp.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -736,7 +736,7 @@ HAL_StatusTypeDef HAL_CRYP_Init(CRYP_HandleTypeDef *hcryp);
736736
HAL_StatusTypeDef HAL_CRYP_DeInit(CRYP_HandleTypeDef *hcryp);
737737
void HAL_CRYP_MspInit(CRYP_HandleTypeDef *hcryp);
738738
void HAL_CRYP_MspDeInit(CRYP_HandleTypeDef *hcryp);
739-
HAL_StatusTypeDef HAL_CRYP_SetConfig(CRYP_HandleTypeDef *hcryp, CRYP_ConfigTypeDef *pConf);
739+
HAL_StatusTypeDef HAL_CRYP_SetConfig(CRYP_HandleTypeDef *hcryp, const CRYP_ConfigTypeDef *pConf);
740740
HAL_StatusTypeDef HAL_CRYP_GetConfig(CRYP_HandleTypeDef *hcryp, CRYP_ConfigTypeDef *pConf);
741741
#if (USE_HAL_CRYP_REGISTER_CALLBACKS == 1U)
742742
HAL_StatusTypeDef HAL_CRYP_RegisterCallback(CRYP_HandleTypeDef *hcryp, HAL_CRYP_CallbackIDTypeDef CallbackID,

‎stm32cube/stm32n6xx/drivers/include/stm32n6xx_hal_def.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -196,9 +196,9 @@ typedef enum
196196
#define __NON_CACHEABLE_SECTION_END ((uint32_t) __sfe(".noncacheable"))
197197
#elif defined(__ARMCC_VERSION)
198198
extern uint32_t Image$$RW_NONCACHEABLEBUFFER$$Base;
199-
extern uint32_t Image$$RW_NONCACHEABLEBUFFER$$Length;
200-
#define __NON_CACHEABLE_SECTION_BEGIN Image$$RW_NONCACHEABLEBUFFER$$Base
201-
#define __NON_CACHEABLE_SECTION_END (__NON_CACHEABLE_SECTION_BEGIN + Image$$RW_NONCACHEABLEBUFFER$$Length)
199+
extern uint32_t Image$$RW_NONCACHEABLEBUFFER$$Limit;
200+
#define __NON_CACHEABLE_SECTION_BEGIN ((uint32_t) &Image$$RW_NONCACHEABLEBUFFER$$Base)
201+
#define __NON_CACHEABLE_SECTION_END ((uint32_t) &Image$$RW_NONCACHEABLEBUFFER$$Limit-1)
202202
#elif defined(__GNUC__)
203203
extern uint32_t __snoncacheable;
204204
extern uint32_t __enoncacheable;

0 commit comments

Comments
 (0)