Merge pull request #582 from stellar-aria/feature/driver_and_hal_update

Update internal CMSIS and HAL
electro-smith · Feb 21, 2024 · 9d93eea · 9d93eea
2 parents 3ec3bbe + 104c3d6
commit 9d93eea
Show file tree

Hide file tree

Showing 684 changed files with 1,598 additions and 768,659 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -30,7 +30,10 @@ jobs:
   build-makefile:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - name: Checkout
+      uses: actions/checkout@v2
+      with:
+        submodules: recursive    
     - name: Setup arm-none-eabi-gcc
       uses: fiam/arm-none-eabi-gcc@v1
       with:
@@ -42,12 +45,15 @@ jobs:
     - name: Build Library
       run: make -j
     - name: Build Examples
-      run: ./ci/build_examples.py -f core doc src tests
+      run: ./ci/build_examples.py -f core doc src tests Drivers
 
   build-cmake:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - name: Checkout
+      uses: actions/checkout@v2
+      with:
+        submodules: recursive
     - name: Setup arm-none-eabi-gcc
       uses: fiam/arm-none-eabi-gcc@v1
       with:
@@ -57,7 +63,6 @@ jobs:
       with:
         cmake-version: '3.20.x'
     - name: Configure Library
-
       run: cmake -S . -B build -G "Unix Makefiles" -D CMAKE_TOOLCHAIN_FILE=cmake/toolchains/stm32h750xx.cmake -D TOOLCHAIN_PREFIX=$(which arm-none-eabi-gcc | sed -e "s/bin\/arm-none-eabi-gcc//")
     - name: Build Library
       run: cmake --build build
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,18 @@
 [submodule "tests/googletest"]
 	path = tests/googletest
 	url = https://github.com/google/googletest.git
+[submodule "Drivers/CMSIS/DSP"]
+	path = Drivers/CMSIS-DSP
+	url = https://github.com/ARM-software/CMSIS-DSP/
+[submodule "Drivers/CMSIS_5"]
+	path = Drivers/CMSIS_5
+	url = https://github.com/ARM-software/CMSIS_5
+[submodule "Drivers/CMSIS-Device/ST/STM32H7xx"]
+	path = Drivers/CMSIS-Device/ST/STM32H7xx
+	url = https://github.com/STMicroelectronics/cmsis_device_h7/
+[submodule "Drivers/STM32H7xx_HAL_Driver"]
+	path = Drivers/STM32H7xx_HAL_Driver
+	url = https://github.com/STMicroelectronics/stm32h7xx_hal_driver
+[submodule "Middlewares/ST/STM32_USB_Device_Library"]
+	path = Middlewares/ST/STM32_USB_Device_Library
+	url = https://github.com/STMicroelectronics/stm32_mw_usb_device
diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
@@ -8,8 +8,8 @@
                 "${workspaceRoot}/tests/googletest/googletest/include",
                 "${workspaceRoot}/src/sys",
                 "${workspaceRoot}/src/usbd",
-                "${workspaceRoot}/Drivers/CMSIS/Include",
-                "${workspaceRoot}/Drivers/CMSIS/Device/ST/STM32H7xx/Include",
+                "${workspaceRoot}/Drivers/CMSIS_5/CMSIS/Core/Include",
+                "${workspaceRoot}/Drivers/CMSIS-Device/ST/STM32H7xx/Include",
                 "${workspaceRoot}/Drivers/STM32H7xx_HAL_Driver/Inc",
                 "${workspaceRoot}/Drivers/STM32H7xx_HAL_Driver/Inc/Legacy",
                 "${workspaceRoot}/Middlewares/ST/STM32_USB_Device_Library/Core/Inc",
@@ -40,8 +40,8 @@
                 "${workspaceRoot}/src",
                 "${workspaceRoot}/src/sys",
                 "${workspaceRoot}/src/usbd",
-                "${workspaceRoot}/Drivers/CMSIS/Include",
-                "${workspaceRoot}/Drivers/CMSIS/Device/ST/STM32H7xx/Include",
+                "${workspaceRoot}/Drivers/CMSIS_5/CMSIS/Core/Include",
+                "${workspaceRoot}/Drivers/CMSIS-Device/ST/STM32H7xx/Include",
                 "${workspaceRoot}/Drivers/STM32H7xx_HAL_Driver/Inc",
                 "${workspaceRoot}/Drivers/STM32H7xx_HAL_Driver/Inc/Legacy",
                 "${workspaceRoot}/Middlewares/ST/STM32_USB_Device_Library/Core/Inc",

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -74,6 +74,7 @@ add_library(${TARGET} STATIC
     Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_adc_ex.c
     Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_cec.c
     Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_comp.c
+    Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_cordic.c
     Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_cortex.c
     Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_crc.c
     Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_crc_ex.c
@@ -83,16 +84,20 @@ add_library(${TARGET} STATIC
     Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_dac_ex.c
     Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_dcmi.c
     Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_dfsdm.c
+    Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_dfsdm_ex.c
     Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_dma.c
-    Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_dma2d.c
     Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_dma_ex.c
+    Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_dma2d.c
     Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_dsi.c
+    Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_dts.c
     Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_eth.c
     Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_eth_ex.c
     Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_exti.c
     Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_fdcan.c
     Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_flash.c
     Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_flash_ex.c
+    Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_fmac.c
+    Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_gfxmmu.c
     Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_gpio.c
     Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_hash.c
     Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_hash_ex.c
@@ -113,39 +118,40 @@ add_library(${TARGET} STATIC
     Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_mdma.c
     Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_mmc.c
     Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_mmc_ex.c
-    Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_msp_template.c
     Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_nand.c
     Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_nor.c
     Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_opamp.c
     Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_opamp_ex.c
+    Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_ospi.c
+    Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_otfdec.c
     Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_pcd.c
     Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_pcd_ex.c
+    Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_pssi.c
     Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_pwr.c
     Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_pwr_ex.c
     Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_qspi.c
     Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_ramecc.c
     Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_rcc.c
     Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_rcc_ex.c
     Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_rng.c
+    Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_rng_ex.c
     Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_rtc.c
     Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_rtc_ex.c
     Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_sai.c
     Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_sai_ex.c
     Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_sd.c
-    Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_sdram.c
     Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_sd_ex.c
+    Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_sdram.c
     Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_smartcard.c
     Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_smartcard_ex.c
     Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_smbus.c
+    Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_smbus_ex.c
     Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_spdifrx.c
     Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_spi.c
     Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_spi_ex.c
     Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_sram.c
     Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_swpmi.c
     Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_tim.c
-    Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_timebase_rtc_alarm_template.c
-    Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_timebase_rtc_wakeup_template.c
-    Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_timebase_tim_template.c
     Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_tim_ex.c
     Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_uart.c
     Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_uart_ex.c
@@ -155,12 +161,15 @@ add_library(${TARGET} STATIC
     Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_ll_adc.c
     Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_ll_bdma.c
     Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_ll_comp.c
+    Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_ll_cordic.c
     Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_ll_crc.c
+    Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_ll_crs.c
     Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_ll_dac.c
     Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_ll_delayblock.c
     Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_ll_dma.c
     Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_ll_dma2d.c
     Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_ll_exti.c
+    Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_ll_fmac.c
     Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_ll_fmc.c
     Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_ll_gpio.c
     Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_ll_hrtim.c
@@ -173,15 +182,15 @@ add_library(${TARGET} STATIC
     Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_ll_rcc.c
     Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_ll_rng.c
     Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_ll_rtc.c
-    Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_ll_sdmmc.c
+    Drivers/Patched/STM32H7xx_HAL_Driver/Src/stm32h7xx_ll_sdmmc.c
     Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_ll_spi.c
     Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_ll_swpmi.c
     Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_ll_tim.c
     Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_ll_usart.c
     Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_ll_usb.c
     Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_ll_utils.c
 
-    Middlewares/ST/STM32_USB_Device_Library/Class/CDC/Src/usbd_cdc.c
+    Middlewares/Patched/ST/STM32_USB_Device_Library/Class/CDC/Src/usbd_cdc.c
     Middlewares/ST/STM32_USB_Device_Library/Core/Src/usbd_core.c
     Middlewares/ST/STM32_USB_Device_Library/Core/Src/usbd_ctlreq.c
     Middlewares/ST/STM32_USB_Device_Library/Core/Src/usbd_ioreq.c
@@ -200,12 +209,12 @@ add_library(${TARGET} STATIC
 
 target_include_directories(${TARGET} PUBLIC
     ${MODULE_DIR}
-    Drivers/CMSIS/Include
-    Drivers/CMSIS/Device/ST/STM32H7xx/Include
+    Drivers/CMSIS_5/CMSIS/Core/Include
+    Drivers/CMSIS-Device/ST/STM32H7xx/Include
     Drivers/STM32H7xx_HAL_Driver/Inc
     Drivers/STM32H7xx_HAL_Driver/Inc/Legacy
     Middlewares/ST/STM32_USB_Device_Library/Core/Inc
-    Middlewares/ST/STM32_USB_Device_Library/Class/CDC/Inc
+    Middlewares/Patched/ST/STM32_USB_Device_Library/Class/CDC/Inc
     Middlewares/ST/STM32_USB_Host_Library/Core/Inc
     Middlewares/ST/STM32_USB_Host_Library/Class/MSC/Inc
     Middlewares/Third_Party/FatFs/src

diff --git a/Drivers/CMSIS-DSP b/Drivers/CMSIS-DSP
diff --git a/Drivers/CMSIS-Device/ST/STM32H7xx b/Drivers/CMSIS-Device/ST/STM32H7xx