Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update internal CMSIS and HAL #582

Merged
merged 25 commits into from
Feb 21, 2024
Merged

Update internal CMSIS and HAL #582

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
b8f4f6e
Update CMSIS and HAL drivers
stellar-aria May 22, 2023
7cd129b
Update the HAL configuration
stellar-aria May 22, 2023
47adccb
Update build configurations and Makefiles
stellar-aria May 22, 2023
1a10853
Change OUTPUT_OD to OPEN_DRAIN due to HAL macro name conflict
stellar-aria May 22, 2023
048d21d
cmsis_gcc.h must be imported with external C linkage due to a bug see…
stellar-aria May 22, 2023
ea08525
Fix left operand integer length so tests compile and run
stellar-aria May 22, 2023
41d1d02
Style compliance
stellar-aria May 22, 2023
df59e0e
Remove out-of-source CMSIS-DSP
stellar-aria Jun 11, 2023
99703dd
Add CMSIS-DSP as a submodule, pinned to v1.14.4
stellar-aria Jun 11, 2023
a7c30f3
Migrate CMSIS and the CMSIS Device Driver to submodules
stellar-aria Jun 12, 2023
bd40231
Switch HAL Driver to submodule
stellar-aria Jun 12, 2023
6f6a746
Patch stm32h7xx_ll_sdmmc.c
stellar-aria Jun 12, 2023
d60c615
Update various makefiles
stellar-aria Jun 12, 2023
c7c67ba
Fix naming issues (case-insensisitive filesystem)
stellar-aria Jun 12, 2023
0366831
Update GitHub Actions build tasks
stellar-aria Jun 13, 2023
3b8c15b
USB Device Middleware swapped for submodule
stellar-aria Jun 19, 2023
66cb8fb
Merge remote-tracking branch 'upstream/master' into feature/driver_an…
stellar-aria Dec 19, 2023
7367232
Fix clang-format issues
stellar-aria Dec 19, 2023
d8dbd2f
Patch usbd issue
beserge Feb 15, 2024
3a6cfcb
Move patched middleware file out of middleware repo
beserge Feb 15, 2024
cd5ef9b
Update HAL Driver
beserge Feb 15, 2024
32eef17
Move patched middleware file org
beserge Feb 15, 2024
1924045
Clean up hacked files
beserge Feb 16, 2024
077ec41
Fix style
beserge Feb 16, 2024
104c3d6
Fix cmake build
beserge Feb 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
13 changes: 9 additions & 4 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand All @@ -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
15 changes: 15 additions & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
8 changes: 4 additions & 4 deletions .vscode/c_cpp_properties.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
31 changes: 20 additions & 11 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
1 change: 1 addition & 0 deletions Drivers/CMSIS-DSP
Open in desktop
Submodule CMSIS-DSP added at 3a04f8
1 change: 1 addition & 0 deletions Drivers/CMSIS-Device/ST/STM32H7xx
Open in desktop
Submodule STM32H7xx added at 6dac8c
Loading
Loading