Merge pull request #1965 from fpistm/CubeU5_Update

Update to latest STM32CubeU5 v1.2.0 and open_pin_data v6.0.80

Author: fpistm

Diff for: CI/update/stm32variant.py

@@ -149,7 +149,7 @@ def parse_mcu_file():
     global mcu_refname
 
     tim_regex = r"^(TIM\d+)$"
-    usb_regex = r"^(USB(?!PD|_HOST|_DEVICE).*)$"
+    usb_regex = r"^(USB(?!PD|_HOST|_DEVICE|X).*)$"
     gpiofile = ""
     del tim_inst_list[:]
     del mcu_ram[:]

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

@@ -86,10 +86,15 @@
   #endif
 #endif
 
-/* STM32G0xx defined USB_DRD_FS */
+/* STM32G0xx and some STM32U5xx defined USB_DRD_FS */
 #if !defined(USB) && defined(USB_DRD_FS)
   #define USB USB_DRD_FS
   #define PinMap_USB PinMap_USB_DRD_FS
+  #if defined(STM32U5xx)
+    #define USB_BASE USB_DRD_BASE
+    #define __HAL_RCC_USB_CLK_ENABLE __HAL_RCC_USB_FS_CLK_ENABLE
+    #define __HAL_RCC_USB_CLK_DISABLE __HAL_RCC_USB_FS_CLK_DISABLE
+  #endif
 #endif
 
 /**

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

@@ -414,6 +414,10 @@
     #define CMSIS_STARTUP_FILE "startup_stm32mp157cxx_cm4.s"
   #elif defined(STM32MP15xx)
     #define CMSIS_STARTUP_FILE "startup_stm32mp15xx.s"
+  #elif defined(STM32U535xx)
+    #define CMSIS_STARTUP_FILE "startup_stm32u535xx.s"
+  #elif defined(STM32U545xx)
+    #define CMSIS_STARTUP_FILE "startup_stm32u545xx.s"
   #elif defined(STM32U575xx)
     #define CMSIS_STARTUP_FILE "startup_stm32u575xx.s"
   #elif defined(STM32U585xx)

Diff for: cores/arduino/stm32/usb/usbd_conf.c

@@ -105,7 +105,9 @@ void HAL_PCD_MspInit(PCD_HandleTypeDef *hpcd)
 #ifdef __HAL_USB_WAKEUP_EXTI_ENABLE_RISING_EDGE
       __HAL_USB_WAKEUP_EXTI_ENABLE_RISING_EDGE();
 #endif
+#ifdef __HAL_USB_WAKEUP_EXTI_ENABLE_IT
       __HAL_USB_WAKEUP_EXTI_ENABLE_IT();
+#endif
 #if defined(USB_WKUP_IRQn)
       /* USB Wakeup Interrupt */
       HAL_NVIC_EnableIRQ(USB_WKUP_IRQn);

Diff for: cores/arduino/stm32/usb/usbd_conf.h

@@ -74,7 +74,7 @@ extern "C" {
 #elif defined(STM32G0xx)
 #define USB_IRQn USB_UCPD1_2_IRQn
 #define USB_IRQHandler USB_UCPD1_2_IRQHandler
-#elif defined(STM32U5xx)
+#elif defined(STM32U5xx) && !defined(USB_DRD_FS)
 #define USB_IRQn OTG_FS_IRQn
 #define USB_IRQHandler OTG_FS_IRQHandler
 #elif defined(STM32L5xx)