Skip to content

Commit 2e92c39

Browse files
authored
Merge pull request #1685 from ABOSTM/UPDATE_U5
system(U5) update STM32U5xx HAL Drivers to v1.1.0 , CMSIS Drivers to v1.1.0
2 parents 5821d68 + ba2ea41 commit 2e92c39

File tree

219 files changed

+148801
-7549
lines changed

Some content is hidden

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

219 files changed

+148801
-7549
lines changed

Diff for: cores/arduino/stm32/stm32_def_build.h

+8
Original file line numberDiff line numberDiff line change
@@ -414,6 +414,14 @@
414414
#define CMSIS_STARTUP_FILE "startup_stm32u575xx.s"
415415
#elif defined(STM32U585xx)
416416
#define CMSIS_STARTUP_FILE "startup_stm32u585xx.s"
417+
#elif defined(STM32U595xx)
418+
#define CMSIS_STARTUP_FILE "startup_stm32u595xx.s"
419+
#elif defined(STM32U599xx)
420+
#define CMSIS_STARTUP_FILE "startup_stm32u599xx.s"
421+
#elif defined(STM32U5A5xx)
422+
#define CMSIS_STARTUP_FILE "startup_stm32u5a5xx.s"
423+
#elif defined(STM32U5A9xx)
424+
#define CMSIS_STARTUP_FILE "startup_stm32u5a9xx.s"
417425
#elif defined(STM32WB10xx)
418426
#define CMSIS_STARTUP_FILE "startup_stm32wb10xx_cm4.s"
419427
#elif defined(STM32WB15xx)

Diff for: libraries/SrcWrapper/src/HAL/stm32yyxx_hal_dsi.c

+2
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,7 @@
1010
#include "stm32h7xx_hal_dsi.c"
1111
#elif STM32L4xx
1212
#include "stm32l4xx_hal_dsi.c"
13+
#elif STM32U5xx
14+
#include "stm32u5xx_hal_dsi.c"
1315
#endif
1416
#pragma GCC diagnostic pop

Diff for: libraries/SrcWrapper/src/HAL/stm32yyxx_hal_gfxmmu.c

+2
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,7 @@
66
#include "stm32h7xx_hal_gfxmmu.c"
77
#elif STM32L4xx
88
#include "stm32l4xx_hal_gfxmmu.c"
9+
#elif STM32U5xx
10+
#include "stm32u5xx_hal_gfxmmu.c"
911
#endif
1012
#pragma GCC diagnostic pop

Diff for: libraries/SrcWrapper/src/HAL/stm32yyxx_hal_gpu2d.c

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
/* HAL raised several warnings, ignore them */
2+
#pragma GCC diagnostic push
3+
#pragma GCC diagnostic ignored "-Wunused-parameter"
4+
5+
#ifdef STM32U5xx
6+
#include "stm32u5xx_hal_gpu2d.c"
7+
#endif
8+
#pragma GCC diagnostic pop

Diff for: libraries/SrcWrapper/src/HAL/stm32yyxx_hal_ltdc.c

+2
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,7 @@
1010
#include "stm32h7xx_hal_ltdc.c"
1111
#elif STM32L4xx
1212
#include "stm32l4xx_hal_ltdc.c"
13+
#elif STM32U5xx
14+
#include "stm32u5xx_hal_ltdc.c"
1315
#endif
1416
#pragma GCC diagnostic pop

Diff for: libraries/SrcWrapper/src/HAL/stm32yyxx_hal_ltdc_ex.c

+2
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,7 @@
1010
#include "stm32h7xx_hal_ltdc_ex.c"
1111
#elif STM32L4xx
1212
#include "stm32l4xx_hal_ltdc_ex.c"
13+
#elif STM32U5xx
14+
#include "stm32u5xx_hal_ltdc_ex.c"
1315
#endif
1416
#pragma GCC diagnostic pop

Diff for: libraries/SrcWrapper/src/HAL/stm32yyxx_hal_xspi.c

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
/* HAL raised several warnings, ignore them */
2+
#pragma GCC diagnostic push
3+
#pragma GCC diagnostic ignored "-Wunused-parameter"
4+
5+
#ifdef STM32U5xx
6+
#include "stm32u5xx_hal_xspi.c"
7+
#endif
8+
#pragma GCC diagnostic pop

Diff for: system/Drivers/CMSIS/Device/ST/STM32U5xx/Include/Templates/partition_stm32u575xx.h

+24-29
Original file line numberDiff line numberDiff line change
@@ -12,24 +12,24 @@
1212
* - Setup Interrupt Target
1313
*
1414
******************************************************************************/
15-
/*
16-
* Copyright (c) 2009-2016 ARM Limited. All rights reserved.
17-
* Portions Copyright (c) 2021 STMicroelectronics, all rights reserved
18-
*
19-
* SPDX-License-Identifier: Apache-2.0
15+
/**
16+
* Copyright (c) 2009-2016 ARM Limited. All rights reserved.
17+
* Portions Copyright (c) 2021 STMicroelectronics, all rights reserved
2018
*
21-
* Licensed under the Apache License, Version 2.0 (the License); you may
22-
* not use this file except in compliance with the License.
23-
* You may obtain a copy of the License at
19+
* SPDX-License-Identifier: Apache-2.0
2420
*
25-
* http://www.apache.org/licenses/LICENSE-2.0
21+
* Licensed under the Apache License, Version 2.0 (the License); you may
22+
* not use this file except in compliance with the License.
23+
* You may obtain a copy of the License at
2624
*
27-
* Unless required by applicable law or agreed to in writing, software
28-
* distributed under the License is distributed on an AS IS BASIS, WITHOUT
29-
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
30-
* See the License for the specific language governing permissions and
31-
* limitations under the License.
32-
*/
25+
* http://www.apache.org/licenses/LICENSE-2.0
26+
*
27+
* Unless required by applicable law or agreed to in writing, software
28+
* distributed under the License is distributed on an AS IS BASIS, WITHOUT
29+
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
30+
* See the License for the specific language governing permissions and
31+
* limitations under the License.
32+
*/
3333

3434
#ifndef PARTITION_STM32U575XX_H
3535
#define PARTITION_STM32U575XX_H
@@ -377,7 +377,7 @@
377377
/*
378378
// Interrupts 0..31
379379
// <o.0> WWDG_IRQn <0=> Secure state <1=> Non-Secure state
380-
// <o.1> PVD_AVD_IRQn <0=> Secure state <1=> Non-Secure state
380+
// <o.1> PVD_PVM_IRQn <0=> Secure state <1=> Non-Secure state
381381
// <o.2> RTC_IRQn <0=> Secure state <1=> Non-Secure state
382382
// <o.3> RTC_S_IRQn <0=> Secure state <1=> Non-Secure state
383383
// <o.4> TAMP_IRQn <0=> Secure state <1=> Non-Secure state
@@ -404,7 +404,6 @@
404404
// <o.25> EXTI14_IRQn <0=> Secure state <1=> Non-Secure state
405405
// <o.26> EXTI15_IRQn <0=> Secure state <1=> Non-Secure state
406406
// <o.27> IWDG_IRQn <0=> Secure state <1=> Non-Secure state
407-
// <o.28> SAES_IRQn <0=> Secure state <1=> Non-Secure state
408407
// <o.29> GPDMA1_Channel0_IRQn <0=> Secure state <1=> Non-Secure state
409408
// <o.30> GPDMA1_Channel1_IRQn <0=> Secure state <1=> Non-Secure state
410409
// <o.31> GPDMA1_Channel2_IRQn <0=> Secure state <1=> Non-Secure state
@@ -428,7 +427,7 @@
428427
// <o.3> GPDMA1_Channel6_IRQn <0=> Secure state <1=> Non-Secure state
429428
// <o.4> GPDMA1_Channel7_IRQn <0=> Secure state <1=> Non-Secure state
430429
// <o.5> ADC1_IRQn <0=> Secure state <1=> Non-Secure state
431-
// <o.6> DAC_IRQn <0=> Secure state <1=> Non-Secure state
430+
// <o.6> DAC1_IRQn <0=> Secure state <1=> Non-Secure state
432431
// <o.7> FDCAN1_IT0_IRQn <0=> Secure state <1=> Non-Secure state
433432
// <o.8> FDCAN1_IT1_IRQn <0=> Secure state <1=> Non-Secure state
434433
// <o.9> TIM1_BRK_IRQn <0=> Secure state <1=> Non-Secure state
@@ -479,7 +478,7 @@
479478
// <o.8> COMP_IRQn <0=> Secure state <1=> Non-Secure state
480479
// <o.9> OTG_FS_IRQn <0=> Secure state <1=> Non-Secure state
481480
// <o.10> CRS_IRQn <0=> Secure state <1=> Non-Secure state
482-
// <o.11> FSMC_IRQn <0=> Secure state <1=> Non-Secure state
481+
// <o.11> FMC_IRQn <0=> Secure state <1=> Non-Secure state
483482
// <o.12> OCTOSPI1_IRQn <0=> Secure state <1=> Non-Secure state
484483
// <o.13> PWR_S3WU_IRQn <0=> Secure state <1=> Non-Secure state
485484
// <o.14> SDMMC1_IRQn <0=> Secure state <1=> Non-Secure state
@@ -497,7 +496,6 @@
497496
// <o.26> SAI1_IRQn <0=> Secure state <1=> Non-Secure state
498497
// <o.27> SAI2_IRQn <0=> Secure state <1=> Non-Secure state
499498
// <o.28> TSC_IRQn <0=> Secure state <1=> Non-Secure state
500-
// <o.29> AES_IRQn <0=> Secure state <1=> Non-Secure state
501499
// <o.30> RNG_IRQn <0=> Secure state <1=> Non-Secure state
502500
// <o.31> FPU_IRQn <0=> Secure state <1=> Non-Secure state
503501
*/
@@ -508,14 +506,13 @@
508506
*/
509507

510508
/*
511-
// <e>Initialize ITNS 3 (Interrupts 96..108)
509+
// <e>Initialize ITNS 3 (Interrupts 96..125)
512510
*/
513511
#define NVIC_INIT_ITNS3 1
514512

515513
/*
516514
// Interrupts 96..125
517515
// <o.0> HASH_IRQn <0=> Secure state <1=> Non-Secure state
518-
// <o.1> PKA_IRQn <0=> Secure state <1=> Non-Secure state
519516
// <o.2> LPTIM3_IRQn <0=> Secure state <1=> Non-Secure state
520517
// <o.3> SPI3_IRQn <0=> Secure state <1=> Non-Secure state
521518
// <o.4> I2C4_ER_IRQn <0=> Secure state <1=> Non-Secure state
@@ -526,18 +523,16 @@
526523
// <o.9> MDF1_FLT3_IRQn <0=> Secure state <1=> Non-Secure state
527524
// <o.10> UCPD1_IRQn <0=> Secure state <1=> Non-Secure state
528525
// <o.11> ICACHE_IRQn <0=> Secure state <1=> Non-Secure state
529-
// <o.12> OTFDEC1_IRQn <0=> Secure state <1=> Non-Secure state
530-
// <o.13> OTFDEC2_IRQn <0=> Secure state <1=> Non-Secure state
531526
// <o.14> LPTIM4_IRQn <0=> Secure state <1=> Non-Secure state
532527
// <o.15> DCACHE1_IRQn <0=> Secure state <1=> Non-Secure state
533528
// <o.16> ADF1_IRQn <0=> Secure state <1=> Non-Secure state
534529
// <o.17> ADC4_IRQn <0=> Secure state <1=> Non-Secure state
535-
// <o.18> LPDMA_Channel0_IRQn <0=> Secure state <1=> Non-Secure state
536-
// <o.19> LPDMA_Channel1_IRQn <0=> Secure state <1=> Non-Secure state
537-
// <o.20> LPDMA_Channel2_IRQn <0=> Secure state <1=> Non-Secure state
538-
// <o.21> LPDMA_Channel3_IRQn <0=> Secure state <1=> Non-Secure state
530+
// <o.18> LPDMA1_Channel0_IRQn <0=> Secure state <1=> Non-Secure state
531+
// <o.19> LPDMA1_Channel1_IRQn <0=> Secure state <1=> Non-Secure state
532+
// <o.20> LPDMA1_Channel2_IRQn <0=> Secure state <1=> Non-Secure state
533+
// <o.21> LPDMA1_Channel3_IRQn <0=> Secure state <1=> Non-Secure state
539534
// <o.22> DMA2D_IRQn <0=> Secure state <1=> Non-Secure state
540-
// <o.23> DCMI_IRQn <0=> Secure state <1=> Non-Secure state
535+
// <o.23> DCMI_PSSI_IRQn <0=> Secure state <1=> Non-Secure state
541536
// <o.24> OCTOSPI2_IRQn <0=> Secure state <1=> Non-Secure state
542537
// <o.25> MDF1_FLT4_IRQn <0=> Secure state <1=> Non-Secure state
543538
// <o.26> MDF1_FLT5_IRQn <0=> Secure state <1=> Non-Secure state

Diff for: system/Drivers/CMSIS/Device/ST/STM32U5xx/Include/Templates/partition_stm32u585xx.h

+23-23
Original file line numberDiff line numberDiff line change
@@ -12,24 +12,24 @@
1212
* - Setup Interrupt Target
1313
*
1414
******************************************************************************/
15-
/*
16-
* Copyright (c) 2009-2016 ARM Limited. All rights reserved.
17-
* Portions Copyright (c) 2021 STMicroelectronics, all rights reserved
18-
*
19-
* SPDX-License-Identifier: Apache-2.0
15+
/**
16+
* Copyright (c) 2009-2016 ARM Limited. All rights reserved.
17+
* Portions Copyright (c) 2021 STMicroelectronics, all rights reserved
2018
*
21-
* Licensed under the Apache License, Version 2.0 (the License); you may
22-
* not use this file except in compliance with the License.
23-
* You may obtain a copy of the License at
19+
* SPDX-License-Identifier: Apache-2.0
2420
*
25-
* http://www.apache.org/licenses/LICENSE-2.0
21+
* Licensed under the Apache License, Version 2.0 (the License); you may
22+
* not use this file except in compliance with the License.
23+
* You may obtain a copy of the License at
2624
*
27-
* Unless required by applicable law or agreed to in writing, software
28-
* distributed under the License is distributed on an AS IS BASIS, WITHOUT
29-
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
30-
* See the License for the specific language governing permissions and
31-
* limitations under the License.
32-
*/
25+
* http://www.apache.org/licenses/LICENSE-2.0
26+
*
27+
* Unless required by applicable law or agreed to in writing, software
28+
* distributed under the License is distributed on an AS IS BASIS, WITHOUT
29+
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
30+
* See the License for the specific language governing permissions and
31+
* limitations under the License.
32+
*/
3333

3434
#ifndef PARTITION_STM32U585XX_H
3535
#define PARTITION_STM32U585XX_H
@@ -377,7 +377,7 @@
377377
/*
378378
// Interrupts 0..31
379379
// <o.0> WWDG_IRQn <0=> Secure state <1=> Non-Secure state
380-
// <o.1> PVD_AVD_IRQn <0=> Secure state <1=> Non-Secure state
380+
// <o.1> PVD_PVM_IRQn <0=> Secure state <1=> Non-Secure state
381381
// <o.2> RTC_IRQn <0=> Secure state <1=> Non-Secure state
382382
// <o.3> RTC_S_IRQn <0=> Secure state <1=> Non-Secure state
383383
// <o.4> TAMP_IRQn <0=> Secure state <1=> Non-Secure state
@@ -428,7 +428,7 @@
428428
// <o.3> GPDMA1_Channel6_IRQn <0=> Secure state <1=> Non-Secure state
429429
// <o.4> GPDMA1_Channel7_IRQn <0=> Secure state <1=> Non-Secure state
430430
// <o.5> ADC1_IRQn <0=> Secure state <1=> Non-Secure state
431-
// <o.6> DAC_IRQn <0=> Secure state <1=> Non-Secure state
431+
// <o.6> DAC1_IRQn <0=> Secure state <1=> Non-Secure state
432432
// <o.7> FDCAN1_IT0_IRQn <0=> Secure state <1=> Non-Secure state
433433
// <o.8> FDCAN1_IT1_IRQn <0=> Secure state <1=> Non-Secure state
434434
// <o.9> TIM1_BRK_IRQn <0=> Secure state <1=> Non-Secure state
@@ -479,7 +479,7 @@
479479
// <o.8> COMP_IRQn <0=> Secure state <1=> Non-Secure state
480480
// <o.9> OTG_FS_IRQn <0=> Secure state <1=> Non-Secure state
481481
// <o.10> CRS_IRQn <0=> Secure state <1=> Non-Secure state
482-
// <o.11> FSMC_IRQn <0=> Secure state <1=> Non-Secure state
482+
// <o.11> FMC_IRQn <0=> Secure state <1=> Non-Secure state
483483
// <o.12> OCTOSPI1_IRQn <0=> Secure state <1=> Non-Secure state
484484
// <o.13> PWR_S3WU_IRQn <0=> Secure state <1=> Non-Secure state
485485
// <o.14> SDMMC1_IRQn <0=> Secure state <1=> Non-Secure state
@@ -532,12 +532,12 @@
532532
// <o.15> DCACHE1_IRQn <0=> Secure state <1=> Non-Secure state
533533
// <o.16> ADF1_IRQn <0=> Secure state <1=> Non-Secure state
534534
// <o.17> ADC4_IRQn <0=> Secure state <1=> Non-Secure state
535-
// <o.18> LPDMA_Channel0_IRQn <0=> Secure state <1=> Non-Secure state
536-
// <o.19> LPDMA_Channel1_IRQn <0=> Secure state <1=> Non-Secure state
537-
// <o.20> LPDMA_Channel2_IRQn <0=> Secure state <1=> Non-Secure state
538-
// <o.21> LPDMA_Channel3_IRQn <0=> Secure state <1=> Non-Secure state
535+
// <o.18> LPDMA1_Channel0_IRQn <0=> Secure state <1=> Non-Secure state
536+
// <o.19> LPDMA1_Channel1_IRQn <0=> Secure state <1=> Non-Secure state
537+
// <o.20> LPDMA1_Channel2_IRQn <0=> Secure state <1=> Non-Secure state
538+
// <o.21> LPDMA1_Channel3_IRQn <0=> Secure state <1=> Non-Secure state
539539
// <o.22> DMA2D_IRQn <0=> Secure state <1=> Non-Secure state
540-
// <o.23> DCMI_IRQn <0=> Secure state <1=> Non-Secure state
540+
// <o.23> DCMI_PSSI_IRQn <0=> Secure state <1=> Non-Secure state
541541
// <o.24> OCTOSPI2_IRQn <0=> Secure state <1=> Non-Secure state
542542
// <o.25> MDF1_FLT4_IRQn <0=> Secure state <1=> Non-Secure state
543543
// <o.26> MDF1_FLT5_IRQn <0=> Secure state <1=> Non-Secure state

0 commit comments

Comments
 (0)