Skip to content

Commit 76b538d

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 7b8c26e commit 76b538d

File tree

2 files changed

+73
-55
lines changed

2 files changed

+73
-55
lines changed

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

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -473,7 +473,7 @@ extern "C" {
473473
#define TYPEPROGRAMDATA_FASTHALFWORD FLASH_TYPEPROGRAMDATA_FASTHALFWORD
474474
#define TYPEPROGRAMDATA_FASTWORD FLASH_TYPEPROGRAMDATA_FASTWORD
475475
#if !defined(STM32F2) && !defined(STM32F4) && !defined(STM32F7) && !defined(STM32H7) && !defined(STM32H5)
476-
#define PAGESIZE FLASH_PAGE_SIZE
476+
+/* #define PAGESIZE FLASH_PAGE_SIZE */
477477
#endif /* STM32F2 && STM32F4 && STM32F7 && STM32H7 && STM32H5 */
478478
#define TYPEPROGRAM_FASTBYTE FLASH_TYPEPROGRAM_BYTE
479479
#define TYPEPROGRAM_FASTHALFWORD FLASH_TYPEPROGRAM_HALFWORD
@@ -542,6 +542,10 @@ extern "C" {
542542
#define FLASH_OPTKEY1 FLASH_OPT_KEY1
543543
#define FLASH_OPTKEY2 FLASH_OPT_KEY2
544544
#endif /* STM32H7RS */
545+
#if defined(STM32H7RS)
546+
#define FLASH_OPTKEY1 FLASH_OPT_KEY1
547+
#define FLASH_OPTKEY2 FLASH_OPT_KEY2
548+
#endif /* STM32H7RS */
545549
#if defined(STM32U5)
546550
#define OB_USER_nRST_STOP OB_USER_NRST_STOP
547551
#define OB_USER_nRST_STDBY OB_USER_NRST_STDBY
@@ -1303,22 +1307,26 @@ extern "C" {
13031307
#define TAMP_SECRETDEVICE_ERASE_ENABLE TAMP_SECRETDEVICE_ERASE_ALL
13041308
#endif /* STM32H5 || STM32WBA || STM32H7RS || STM32N6 */
13051309

1310+
#if defined(STM32F7) || defined(STM32WB)
13061311
#if defined(STM32F7) || defined(STM32WB)
13071312
#define RTC_TAMPCR_TAMPXE RTC_TAMPER_ENABLE_BITS_MASK
13081313
#define RTC_TAMPCR_TAMPXIE RTC_TAMPER_IT_ENABLE_BITS_MASK
13091314
#endif /* STM32F7 || STM32WB */
1315+
#endif /* STM32F7 || STM32WB */
13101316

13111317
#if defined(STM32H7)
13121318
#define RTC_TAMPCR_TAMPXE RTC_TAMPER_X
13131319
#define RTC_TAMPCR_TAMPXIE RTC_TAMPER_X_INTERRUPT
13141320
#endif /* STM32H7 */
13151321

1322+
#if defined(STM32F7) || defined(STM32H7) || defined(STM32L0) || defined(STM32WB)
13161323
#if defined(STM32F7) || defined(STM32H7) || defined(STM32L0) || defined(STM32WB)
13171324
#define RTC_TAMPER1_INTERRUPT RTC_IT_TAMP1
13181325
#define RTC_TAMPER2_INTERRUPT RTC_IT_TAMP2
13191326
#define RTC_TAMPER3_INTERRUPT RTC_IT_TAMP3
13201327
#define RTC_ALL_TAMPER_INTERRUPT RTC_IT_TAMP
13211328
#endif /* STM32F7 || STM32H7 || STM32L0 || STM32WB */
1329+
#endif /* STM32F7 || STM32H7 || STM32L0 || STM32WB */
13221330

13231331
/**
13241332
* @}
@@ -3953,6 +3961,7 @@ extern "C" {
39533961
defined (STM32L4P5xx)|| defined (STM32L4Q5xx) || defined (STM32G4) || defined (STM32WL) || defined (STM32U5) || \
39543962
defined (STM32WBA) || defined (STM32H5) || \
39553963
defined (STM32C0) || defined (STM32N6) || defined (STM32H7RS) || defined (STM32U0) || defined (STM32U3)
3964+
defined (STM32C0) || defined (STM32N6) || defined (STM32H7RS) || defined (STM32U0) || defined (STM32U3)
39563965
#else
39573966
#define __HAL_RTC_CLEAR_FLAG __HAL_RTC_EXTI_CLEAR_FLAG
39583967
#endif

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

Lines changed: 63 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -34,60 +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_SDIO_MODULE_ENABLED */
76-
/*#define HAL_SDRAM_MODULE_ENABLED */
77-
/*#define HAL_SMARTCARD_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 */
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
77+
#define HAL_SMARTCARD_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
9191
#define HAL_GPIO_MODULE_ENABLED
9292
#define HAL_EXTI_MODULE_ENABLED
9393
#define HAL_DMA_MODULE_ENABLED
@@ -208,6 +208,7 @@
208208
#define USE_HAL_SAI_REGISTER_CALLBACKS 0U /* SAI register callback disabled */
209209
#define USE_HAL_SD_REGISTER_CALLBACKS 0U /* SD register callback disabled */
210210
#define USE_HAL_SDIO_REGISTER_CALLBACKS 0U /* SDIO register callback disabled */
211+
#define USE_HAL_SDIO_REGISTER_CALLBACKS 0U /* SDIO register callback disabled */
211212
#define USE_HAL_SDRAM_REGISTER_CALLBACKS 0U /* SDRAM register callback disabled */
212213
#define USE_HAL_SMARTCARD_REGISTER_CALLBACKS 0U /* SMARTCARD register callback disabled */
213214
#define USE_HAL_SMBUS_REGISTER_CALLBACKS 0U /* SMBUS register callback disabled */
@@ -236,6 +237,10 @@
236237
#define USE_SDIO_TRANSCEIVER 1U
237238
#define SDIO_MAX_IO_NUMBER 7U /*!< SDIO device support maximum IO number */
238239

240+
/* ################## SDIO peripheral configuration ########################## */
241+
#define USE_SDIO_TRANSCEIVER 1U
242+
#define SDIO_MAX_IO_NUMBER 7U /*!< SDIO device support maximum IO number */
243+
239244
/* Includes ------------------------------------------------------------------*/
240245
/**
241246
* @brief Include module's header file
@@ -436,6 +441,10 @@
436441
#include "stm32n6xx_hal_sdio.h"
437442
#endif /* HAL_SDIO_MODULE_ENABLED */
438443

444+
#ifdef HAL_SDIO_MODULE_ENABLED
445+
#include "stm32n6xx_hal_sdio.h"
446+
#endif /* HAL_SDIO_MODULE_ENABLED */
447+
439448
#ifdef HAL_SDRAM_MODULE_ENABLED
440449
#include "stm32n6xx_hal_sdram.h"
441450
#endif /* HAL_SDRAM_MODULE_ENABLED */

0 commit comments

Comments
 (0)