Skip to content

Commit

Permalink
chore(core): change STM32Cube submodule to separate hal driver and cm…
Browse files Browse the repository at this point in the history 
…sis submodules.

[no changelog]
  • Loading branch information
@TychoVrahe
TychoVrahe committed Feb 29, 2024
1 parent 9599962 commit 1ea7ca4
Show file tree
Hide file tree
Showing 10 changed files with 50 additions and 43 deletions.
13 changes: 10 additions & 3 deletions .gitmodules
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,13 @@
[submodule "vendor/fido2-tests"]
path = vendor/fido2-tests
url = https://github.com/trezor/fido2-tests.git
[submodule "vendor/stm32cube-u5"]
path = vendor/stm32cube-u5
url = https://github.com/STMicroelectronics/STM32CubeU5.git
[submodule "vendor/cmsis_device_u5"]
path = vendor/cmsis_device_u5
url = https://github.com/STMicroelectronics/cmsis_device_u5.git
[submodule "vendor/cmsis_5"]
path = vendor/cmsis_5
url = https://github.com/ARM-software/CMSIS_5.git

[submodule "vendor/stm32u5xx_hal_driver"]
path = vendor/stm32u5xx_hal_driver
url = https://github.com/trezor/stm32u5xx_hal_driver.git
2 changes: 1 addition & 1 deletion core/site_scons/boards/discovery2.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ def configure(
"embed/trezorhal/stm32u5/usbd_core.c",
"embed/trezorhal/stm32u5/usbd_ctlreq.c",
"embed/trezorhal/stm32u5/usbd_ioreq.c",
"vendor/stm32cube-u5/Drivers/STM32U5xx_HAL_Driver/Src/stm32u5xx_ll_usb.c",
"vendor/stm32u5xx_hal_driver/Src/stm32u5xx_ll_usb.c",
]
features_available.append("usb")

Expand Down
62 changes: 31 additions & 31 deletions core/site_scons/boards/stm32u5_common.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,37 +9,37 @@ def stm32u5_common_files(env, defines, sources, paths):

paths += [
"embed/trezorhal/stm32u5",
"vendor/stm32cube-u5/Drivers/STM32U5xx_HAL_Driver/Inc",
"vendor/stm32cube-u5/Drivers/CMSIS/Device/ST/STM32U5xx/Include",
"vendor/stm32cube-u5/Drivers/CMSIS/Core/Include",
"vendor/stm32u5xx_hal_driver/Inc",
"vendor/cmsis_device_u5/Include",
"vendor/cmsis_5/CMSIS/Core/Include",
]

sources += [
"vendor/stm32cube-u5/Drivers/STM32U5xx_HAL_Driver/Src/stm32u5xx_hal.c",
"vendor/stm32cube-u5/Drivers/STM32U5xx_HAL_Driver/Src/stm32u5xx_hal_cortex.c",
"vendor/stm32cube-u5/Drivers/STM32U5xx_HAL_Driver/Src/stm32u5xx_hal_cryp.c",
"vendor/stm32cube-u5/Drivers/STM32U5xx_HAL_Driver/Src/stm32u5xx_hal_dma2d.c",
"vendor/stm32cube-u5/Drivers/STM32U5xx_HAL_Driver/Src/stm32u5xx_hal_dsi.c",
"vendor/stm32cube-u5/Drivers/STM32U5xx_HAL_Driver/Src/stm32u5xx_hal_flash.c",
"vendor/stm32cube-u5/Drivers/STM32U5xx_HAL_Driver/Src/stm32u5xx_hal_flash_ex.c",
"vendor/stm32cube-u5/Drivers/STM32U5xx_HAL_Driver/Src/stm32u5xx_hal_gfxmmu.c",
"vendor/stm32cube-u5/Drivers/STM32U5xx_HAL_Driver/Src/stm32u5xx_hal_gpio.c",
"vendor/stm32cube-u5/Drivers/STM32U5xx_HAL_Driver/Src/stm32u5xx_hal_gtzc.c",
"vendor/stm32cube-u5/Drivers/STM32U5xx_HAL_Driver/Src/stm32u5xx_hal_i2c.c",
"vendor/stm32cube-u5/Drivers/STM32U5xx_HAL_Driver/Src/stm32u5xx_hal_i2c_ex.c",
"vendor/stm32cube-u5/Drivers/STM32U5xx_HAL_Driver/Src/stm32u5xx_hal_icache.c",
"vendor/stm32cube-u5/Drivers/STM32U5xx_HAL_Driver/Src/stm32u5xx_hal_ltdc.c",
"vendor/stm32cube-u5/Drivers/STM32U5xx_HAL_Driver/Src/stm32u5xx_hal_ltdc_ex.c",
"vendor/stm32cube-u5/Drivers/STM32U5xx_HAL_Driver/Src/stm32u5xx_hal_pcd.c",
"vendor/stm32cube-u5/Drivers/STM32U5xx_HAL_Driver/Src/stm32u5xx_hal_pcd_ex.c",
"vendor/stm32cube-u5/Drivers/STM32U5xx_HAL_Driver/Src/stm32u5xx_hal_pwr.c",
"vendor/stm32cube-u5/Drivers/STM32U5xx_HAL_Driver/Src/stm32u5xx_hal_pwr_ex.c",
"vendor/stm32cube-u5/Drivers/STM32U5xx_HAL_Driver/Src/stm32u5xx_hal_rcc.c",
"vendor/stm32cube-u5/Drivers/STM32U5xx_HAL_Driver/Src/stm32u5xx_hal_rcc_ex.c",
"vendor/stm32cube-u5/Drivers/STM32U5xx_HAL_Driver/Src/stm32u5xx_hal_rtc.c",
"vendor/stm32cube-u5/Drivers/STM32U5xx_HAL_Driver/Src/stm32u5xx_hal_spi.c",
"vendor/stm32cube-u5/Drivers/STM32U5xx_HAL_Driver/Src/stm32u5xx_hal_sram.c",
"vendor/stm32cube-u5/Drivers/STM32U5xx_HAL_Driver/Src/stm32u5xx_ll_fmc.c",
"vendor/stm32u5xx_hal_driver/Src/stm32u5xx_hal.c",
"vendor/stm32u5xx_hal_driver/Src/stm32u5xx_hal_cortex.c",
"vendor/stm32u5xx_hal_driver/Src/stm32u5xx_hal_cryp.c",
"vendor/stm32u5xx_hal_driver/Src/stm32u5xx_hal_dma2d.c",
"vendor/stm32u5xx_hal_driver/Src/stm32u5xx_hal_dsi.c",
"vendor/stm32u5xx_hal_driver/Src/stm32u5xx_hal_flash.c",
"vendor/stm32u5xx_hal_driver/Src/stm32u5xx_hal_flash_ex.c",
"vendor/stm32u5xx_hal_driver/Src/stm32u5xx_hal_gfxmmu.c",
"vendor/stm32u5xx_hal_driver/Src/stm32u5xx_hal_gpio.c",
"vendor/stm32u5xx_hal_driver/Src/stm32u5xx_hal_gtzc.c",
"vendor/stm32u5xx_hal_driver/Src/stm32u5xx_hal_i2c.c",
"vendor/stm32u5xx_hal_driver/Src/stm32u5xx_hal_i2c_ex.c",
"vendor/stm32u5xx_hal_driver/Src/stm32u5xx_hal_icache.c",
"vendor/stm32u5xx_hal_driver/Src/stm32u5xx_hal_ltdc.c",
"vendor/stm32u5xx_hal_driver/Src/stm32u5xx_hal_ltdc_ex.c",
"vendor/stm32u5xx_hal_driver/Src/stm32u5xx_hal_pcd.c",
"vendor/stm32u5xx_hal_driver/Src/stm32u5xx_hal_pcd_ex.c",
"vendor/stm32u5xx_hal_driver/Src/stm32u5xx_hal_pwr.c",
"vendor/stm32u5xx_hal_driver/Src/stm32u5xx_hal_pwr_ex.c",
"vendor/stm32u5xx_hal_driver/Src/stm32u5xx_hal_rcc.c",
"vendor/stm32u5xx_hal_driver/Src/stm32u5xx_hal_rcc_ex.c",
"vendor/stm32u5xx_hal_driver/Src/stm32u5xx_hal_rtc.c",
"vendor/stm32u5xx_hal_driver/Src/stm32u5xx_hal_spi.c",
"vendor/stm32u5xx_hal_driver/Src/stm32u5xx_hal_sram.c",
"vendor/stm32u5xx_hal_driver/Src/stm32u5xx_ll_fmc.c",
]

sources += [
Expand Down Expand Up @@ -77,9 +77,9 @@ def stm32u5_common_files(env, defines, sources, paths):

env.get("ENV")["RUST_INCLUDES"] = (
"-I../trezorhal/stm32u5;"
"-I../../vendor/stm32cube-u5/Drivers/STM32U5xx_HAL_Driver/Inc;"
"-I../../vendor/stm32cube-u5/Drivers/CMSIS/Device/ST/STM32U5xx/Include;"
"-I../../vendor/stm32cube-u5/Drivers/CMSIS/Core/Include;"
"-I../../vendor/stm32u5xx_hal_driver/Inc;"
"-I../../vendor/cmsis_device_u5/Include;"
"-I../../vendor/cmsis_5/CMSIS/Core/Include;"
"-DSTM32_HAL_H=<stm32u5xx.h>;"
"-DSTM32U5;"
"-DFLASH_BLOCK_WORDS=4"
Expand Down
10 changes: 4 additions & 6 deletions core/site_scons/boards/trezor_t3t1_v4.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ def configure(
"embed/trezorhal/stm32u5/haptic/drv2625/drv2625.c",
]
sources += [
"vendor/stm32cube-u5/Drivers/STM32U5xx_HAL_Driver/Src/stm32u5xx_hal_tim.c",
"vendor/stm32cube-u5/Drivers/STM32U5xx_HAL_Driver/Src/stm32u5xx_hal_tim_ex.c",
"vendor/stm32u5xx_hal_driver/Src/stm32u5xx_hal_tim.c",
"vendor/stm32u5xx_hal_driver/Src/stm32u5xx_hal_tim_ex.c",
]
features_available.append("haptic")

Expand All @@ -68,9 +68,7 @@ def configure(
sources += ["embed/extmod/modtrezorio/ff.c"]
sources += ["embed/extmod/modtrezorio/ffunicode.c"]
features_available.append("sd_card")
sources += [
"vendor/stm32cube-u5/Drivers/STM32U5xx_HAL_Driver/Src/stm32u5xx_ll_sdmmc.c"
]
sources += ["vendor/stm32u5xx_hal_driver/Src/stm32u5xx_ll_sdmmc.c"]

if "sbu" in features_wanted:
sources += ["embed/trezorhal/stm32u5/sbu.c"]
Expand All @@ -83,7 +81,7 @@ def configure(
"embed/trezorhal/stm32u5/usbd_core.c",
"embed/trezorhal/stm32u5/usbd_ctlreq.c",
"embed/trezorhal/stm32u5/usbd_ioreq.c",
"vendor/stm32cube-u5/Drivers/STM32U5xx_HAL_Driver/Src/stm32u5xx_ll_usb.c",
"vendor/stm32u5xx_hal_driver/Src/stm32u5xx_ll_usb.c",
]
features_available.append("usb")

Expand Down
1 change: 0 additions & 1 deletion core/vendor/stm32cube-u5
View file

This file was deleted.

1 change: 1 addition & 0 deletions core/vendor/stm32u5xx_hal_driver
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../vendor/stm32u5xx_hal_driver/
1 change: 1 addition & 0 deletions vendor/cmsis_5
Submodule cmsis_5 added at a75f01
1 change: 1 addition & 0 deletions vendor/cmsis_device_u5
Submodule cmsis_device_u5 added at f439f9
1 change: 0 additions & 1 deletion vendor/stm32cube-u5
Submodule stm32cube-u5 deleted from 7942fc
1 change: 1 addition & 0 deletions vendor/stm32u5xx_hal_driver
Submodule stm32u5xx_hal_driver added at 270974

0 comments on commit 1ea7ca4

Please sign in to comment.