arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-11-27 01:48:17 +00:00
Code Issues Releases Wiki Activity

chore(core): change STM32Cube submodule to separate hal driver and cmsis submodules.

Browse Source 
[no changelog]
This commit is contained in:
tychovrahe 2023-11-29 10:43:23 +01:00 committed by TychoVrahe
parent 95999623fc
commit 1ea7ca4149
10 changed files with 50 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
.gitmodules vendored
View File

@ -21,6 +21,13 @@
[submodule "vendor/fido2-tests"] [submodule "vendor/fido2-tests"]
path = vendor/fido2-tests path = vendor/fido2-tests
url = https://github.com/trezor/fido2-tests.git url = https://github.com/trezor/fido2-tests.git
[submodule "vendor/stm32cube-u5"] [submodule "vendor/cmsis_device_u5"]
path = vendor/stm32cube-u5 path = vendor/cmsis_device_u5
url = https://github.com/STMicroelectronics/STM32CubeU5.git 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
core/site_scons/boards/discovery2.py
View File

@ -78,7 +78,7 @@ def configure(
"embed/trezorhal/stm32u5/usbd_core.c", "embed/trezorhal/stm32u5/usbd_core.c",
"embed/trezorhal/stm32u5/usbd_ctlreq.c", "embed/trezorhal/stm32u5/usbd_ctlreq.c",
"embed/trezorhal/stm32u5/usbd_ioreq.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") features_available.append("usb")

62
core/site_scons/boards/stm32u5_common.py
View File

@ -9,37 +9,37 @@ def stm32u5_common_files(env, defines, sources, paths):
paths += [ paths += [
"embed/trezorhal/stm32u5", "embed/trezorhal/stm32u5",
"vendor/stm32cube-u5/Drivers/STM32U5xx_HAL_Driver/Inc", "vendor/stm32u5xx_hal_driver/Inc",
"vendor/stm32cube-u5/Drivers/CMSIS/Device/ST/STM32U5xx/Include", "vendor/cmsis_device_u5/Include",
"vendor/stm32cube-u5/Drivers/CMSIS/Core/Include", "vendor/cmsis_5/CMSIS/Core/Include",
] ]
sources += [ sources += [
"vendor/stm32cube-u5/Drivers/STM32U5xx_HAL_Driver/Src/stm32u5xx_hal.c", "vendor/stm32u5xx_hal_driver/Src/stm32u5xx_hal.c",
"vendor/stm32cube-u5/Drivers/STM32U5xx_HAL_Driver/Src/stm32u5xx_hal_cortex.c", "vendor/stm32u5xx_hal_driver/Src/stm32u5xx_hal_cortex.c",
"vendor/stm32cube-u5/Drivers/STM32U5xx_HAL_Driver/Src/stm32u5xx_hal_cryp.c", "vendor/stm32u5xx_hal_driver/Src/stm32u5xx_hal_cryp.c",
"vendor/stm32cube-u5/Drivers/STM32U5xx_HAL_Driver/Src/stm32u5xx_hal_dma2d.c", "vendor/stm32u5xx_hal_driver/Src/stm32u5xx_hal_dma2d.c",
"vendor/stm32cube-u5/Drivers/STM32U5xx_HAL_Driver/Src/stm32u5xx_hal_dsi.c", "vendor/stm32u5xx_hal_driver/Src/stm32u5xx_hal_dsi.c",
"vendor/stm32cube-u5/Drivers/STM32U5xx_HAL_Driver/Src/stm32u5xx_hal_flash.c", "vendor/stm32u5xx_hal_driver/Src/stm32u5xx_hal_flash.c",
"vendor/stm32cube-u5/Drivers/STM32U5xx_HAL_Driver/Src/stm32u5xx_hal_flash_ex.c", "vendor/stm32u5xx_hal_driver/Src/stm32u5xx_hal_flash_ex.c",
"vendor/stm32cube-u5/Drivers/STM32U5xx_HAL_Driver/Src/stm32u5xx_hal_gfxmmu.c", "vendor/stm32u5xx_hal_driver/Src/stm32u5xx_hal_gfxmmu.c",
"vendor/stm32cube-u5/Drivers/STM32U5xx_HAL_Driver/Src/stm32u5xx_hal_gpio.c", "vendor/stm32u5xx_hal_driver/Src/stm32u5xx_hal_gpio.c",
"vendor/stm32cube-u5/Drivers/STM32U5xx_HAL_Driver/Src/stm32u5xx_hal_gtzc.c", "vendor/stm32u5xx_hal_driver/Src/stm32u5xx_hal_gtzc.c",
"vendor/stm32cube-u5/Drivers/STM32U5xx_HAL_Driver/Src/stm32u5xx_hal_i2c.c", "vendor/stm32u5xx_hal_driver/Src/stm32u5xx_hal_i2c.c",
"vendor/stm32cube-u5/Drivers/STM32U5xx_HAL_Driver/Src/stm32u5xx_hal_i2c_ex.c", "vendor/stm32u5xx_hal_driver/Src/stm32u5xx_hal_i2c_ex.c",
"vendor/stm32cube-u5/Drivers/STM32U5xx_HAL_Driver/Src/stm32u5xx_hal_icache.c", "vendor/stm32u5xx_hal_driver/Src/stm32u5xx_hal_icache.c",
"vendor/stm32cube-u5/Drivers/STM32U5xx_HAL_Driver/Src/stm32u5xx_hal_ltdc.c", "vendor/stm32u5xx_hal_driver/Src/stm32u5xx_hal_ltdc.c",
"vendor/stm32cube-u5/Drivers/STM32U5xx_HAL_Driver/Src/stm32u5xx_hal_ltdc_ex.c", "vendor/stm32u5xx_hal_driver/Src/stm32u5xx_hal_ltdc_ex.c",
"vendor/stm32cube-u5/Drivers/STM32U5xx_HAL_Driver/Src/stm32u5xx_hal_pcd.c", "vendor/stm32u5xx_hal_driver/Src/stm32u5xx_hal_pcd.c",
"vendor/stm32cube-u5/Drivers/STM32U5xx_HAL_Driver/Src/stm32u5xx_hal_pcd_ex.c", "vendor/stm32u5xx_hal_driver/Src/stm32u5xx_hal_pcd_ex.c",
"vendor/stm32cube-u5/Drivers/STM32U5xx_HAL_Driver/Src/stm32u5xx_hal_pwr.c", "vendor/stm32u5xx_hal_driver/Src/stm32u5xx_hal_pwr.c",
"vendor/stm32cube-u5/Drivers/STM32U5xx_HAL_Driver/Src/stm32u5xx_hal_pwr_ex.c", "vendor/stm32u5xx_hal_driver/Src/stm32u5xx_hal_pwr_ex.c",
"vendor/stm32cube-u5/Drivers/STM32U5xx_HAL_Driver/Src/stm32u5xx_hal_rcc.c", "vendor/stm32u5xx_hal_driver/Src/stm32u5xx_hal_rcc.c",
"vendor/stm32cube-u5/Drivers/STM32U5xx_HAL_Driver/Src/stm32u5xx_hal_rcc_ex.c", "vendor/stm32u5xx_hal_driver/Src/stm32u5xx_hal_rcc_ex.c",
"vendor/stm32cube-u5/Drivers/STM32U5xx_HAL_Driver/Src/stm32u5xx_hal_rtc.c", "vendor/stm32u5xx_hal_driver/Src/stm32u5xx_hal_rtc.c",
"vendor/stm32cube-u5/Drivers/STM32U5xx_HAL_Driver/Src/stm32u5xx_hal_spi.c", "vendor/stm32u5xx_hal_driver/Src/stm32u5xx_hal_spi.c",
"vendor/stm32cube-u5/Drivers/STM32U5xx_HAL_Driver/Src/stm32u5xx_hal_sram.c", "vendor/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_ll_fmc.c",
] ]
sources += [ sources += [
@ -77,9 +77,9 @@ def stm32u5_common_files(env, defines, sources, paths):
env.get("ENV")["RUST_INCLUDES"] = ( env.get("ENV")["RUST_INCLUDES"] = (
"-I../trezorhal/stm32u5;" "-I../trezorhal/stm32u5;"
"-I../../vendor/stm32cube-u5/Drivers/STM32U5xx_HAL_Driver/Inc;" "-I../../vendor/stm32u5xx_hal_driver/Inc;"
"-I../../vendor/stm32cube-u5/Drivers/CMSIS/Device/ST/STM32U5xx/Include;" "-I../../vendor/cmsis_device_u5/Include;"
"-I../../vendor/stm32cube-u5/Drivers/CMSIS/Core/Include;" "-I../../vendor/cmsis_5/CMSIS/Core/Include;"
"-DSTM32_HAL_H=<stm32u5xx.h>;" "-DSTM32_HAL_H=<stm32u5xx.h>;"
"-DSTM32U5;" "-DSTM32U5;"
"-DFLASH_BLOCK_WORDS=4" "-DFLASH_BLOCK_WORDS=4"

10
core/site_scons/boards/trezor_t3t1_v4.py
View File

@ -57,8 +57,8 @@ def configure(
"embed/trezorhal/stm32u5/haptic/drv2625/drv2625.c", "embed/trezorhal/stm32u5/haptic/drv2625/drv2625.c",
] ]
sources += [ sources += [
"vendor/stm32cube-u5/Drivers/STM32U5xx_HAL_Driver/Src/stm32u5xx_hal_tim.c", "vendor/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_ex.c",
] ]
features_available.append("haptic") features_available.append("haptic")
@ -68,9 +68,7 @@ def configure(
sources += ["embed/extmod/modtrezorio/ff.c"] sources += ["embed/extmod/modtrezorio/ff.c"]
sources += ["embed/extmod/modtrezorio/ffunicode.c"] sources += ["embed/extmod/modtrezorio/ffunicode.c"]
features_available.append("sd_card") features_available.append("sd_card")
sources += [ sources += ["vendor/stm32u5xx_hal_driver/Src/stm32u5xx_ll_sdmmc.c"]
"vendor/stm32cube-u5/Drivers/STM32U5xx_HAL_Driver/Src/stm32u5xx_ll_sdmmc.c"
]
if "sbu" in features_wanted: if "sbu" in features_wanted:
sources += ["embed/trezorhal/stm32u5/sbu.c"] sources += ["embed/trezorhal/stm32u5/sbu.c"]
@ -83,7 +81,7 @@ def configure(
"embed/trezorhal/stm32u5/usbd_core.c", "embed/trezorhal/stm32u5/usbd_core.c",
"embed/trezorhal/stm32u5/usbd_ctlreq.c", "embed/trezorhal/stm32u5/usbd_ctlreq.c",
"embed/trezorhal/stm32u5/usbd_ioreq.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") features_available.append("usb")

1
core/vendor/stm32cube-u5 vendored
View File

@ -1 +0,0 @@
../../vendor/stm32cube-u5

1
core/vendor/stm32u5xx_hal_driver vendored Symbolic link
View File

@ -0,0 +1 @@
../../vendor/stm32u5xx_hal_driver/

1
vendor/cmsis_5 vendored Submodule

@ -0,0 +1 @@
Subproject commit a75f01746df18bb5b929dfb8dc6c9407fac3a0f3

1
vendor/cmsis_device_u5 vendored Submodule

@ -0,0 +1 @@
Subproject commit f439f9687257f8e69daccb8dc6c4d1ed8dab73aa

1
vendor/stm32cube-u5 vendored

@ -1 +0,0 @@
Subproject commit 7942fc4ea05026e4e9ce72d680f704e9433bce42

1
vendor/stm32u5xx_hal_driver vendored Submodule

@ -0,0 +1 @@
Subproject commit 270974ea816779656ac8bb183344ac017e693677