Merge pull request #2068 from fpistm/stm32CubeU5_1.3.0

Update to latest STM32CubeU5 v1.3.0
stm32duino · Jul 18, 2023 · b03d007 · b03d007
2 parents 3f9aa10 + 9bcdecf
commit b03d007
Show file tree

Hide file tree

Showing 241 changed files with 146,896 additions and 2,500 deletions.
diff --git a/cores/arduino/stm32/stm32_def_build.h b/cores/arduino/stm32/stm32_def_build.h
@@ -438,6 +438,14 @@
     #define CMSIS_STARTUP_FILE "startup_stm32u5a5xx.s"
   #elif defined(STM32U5A9xx)
     #define CMSIS_STARTUP_FILE "startup_stm32u5a9xx.s"
+  #elif defined(STM32U5F7xx)
+    #define CMSIS_STARTUP_FILE "startup_stm32u5f7xx.s"
+  #elif defined(STM32U5F9xx)
+    #define CMSIS_STARTUP_FILE "startup_stm32u5f9xx.s"
+  #elif defined(STM32U5G7xx)
+    #define CMSIS_STARTUP_FILE "startup_stm32u5g7xx.s"
+  #elif defined(STM32U5G9xx)
+    #define CMSIS_STARTUP_FILE "startup_stm32u5g9xx.s"
   #elif defined(STM32WB10xx)
     #define CMSIS_STARTUP_FILE "startup_stm32wb10xx_cm4.s"
   #elif defined(STM32WB15xx)

diff --git a/libraries/SrcWrapper/CMakeLists.txt b/libraries/SrcWrapper/CMakeLists.txt
@@ -58,6 +58,7 @@ add_library(SrcWrapper_bin OBJECT EXCLUDE_FROM_ALL
   src/HAL/stm32yyxx_hal_fmpsmbus.c
   src/HAL/stm32yyxx_hal_fmpsmbus_ex.c
   src/HAL/stm32yyxx_hal_gfxmmu.c
+  src/HAL/stm32yyxx_hal_gfxtim.c
   src/HAL/stm32yyxx_hal_gpio.c
   src/HAL/stm32yyxx_hal_gpio_ex.c
   src/HAL/stm32yyxx_hal_gpu2d.c

diff --git a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_gfxtim.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_gfxtim.c
@@ -0,0 +1,8 @@
+/* HAL raised several warnings, ignore them */
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+
+#ifdef STM32U5xx
+  #include "stm32u5xx_hal_gfxtim.c"
+#endif
+#pragma GCC diagnostic pop
diff --git a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_jpeg.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_jpeg.c
@@ -6,5 +6,7 @@
   #include "stm32f7xx_hal_jpeg.c"
 #elif STM32H7xx
   #include "stm32h7xx_hal_jpeg.c"
+#elif STM32U5xx
+  #include "stm32u5xx_hal_jpeg.c"
 #endif
 #pragma GCC diagnostic pop
diff --git a/system/Drivers/CMSIS/Device/ST/STM32U5xx/Include/Templates/partition_stm32u599xx.h b/system/Drivers/CMSIS/Device/ST/STM32U5xx/Include/Templates/partition_stm32u599xx.h
@@ -404,9 +404,9 @@
 //   <o.25> EXTI14_IRQn           <0=> Secure state <1=> Non-Secure state
 //   <o.26> EXTI15_IRQn           <0=> Secure state <1=> Non-Secure state
 //   <o.27> IWDG_IRQn             <0=> Secure state <1=> Non-Secure state
-//   <o.29> GPDMA1_Channel0_IRQn   <0=> Secure state <1=> Non-Secure state
-//   <o.30> GPDMA1_Channel1_IRQn   <0=> Secure state <1=> Non-Secure state
-//   <o.31> GPDMA1_Channel2_IRQn   <0=> Secure state <1=> Non-Secure state
+//   <o.29> GPDMA1_Channel0_IRQn  <0=> Secure state <1=> Non-Secure state
+//   <o.30> GPDMA1_Channel1_IRQn  <0=> Secure state <1=> Non-Secure state
+//   <o.31> GPDMA1_Channel2_IRQn  <0=> Secure state <1=> Non-Secure state
 */
 #define NVIC_INIT_ITNS0_VAL      0x00000000