arno
/
trezor-firmware
mirror of https://github.com/trezor/trezor-firmware.git
1
0
Fork 0
Code Issues Releases Wiki Activity

feat(core): add STM32CubeU5 submodule

Browse Source 
[no changelog]
cepetr/cordic-experiment
cepetr 8 months ago
parent 60b290fd71
commit 7ee153b7d2
12 changed files with 42 additions and 43 deletions
Show Stats Download Patch File Download Diff File

3
.gitmodules vendored
Unescape View File

@ -21,3 +21,6 @@
[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

1
core/SConscript.bootloader
Unescape View File

@ -158,7 +158,6 @@ env.Replace(
'embed/models',
'embed/trezorhal',
'embed/extmod/modtrezorui',
'vendor/micropython/lib/cmsis/inc',
'vendor/nanopb',
] + CPPPATH_MOD + PATH_HAL,
CPPDEFINES=[

1
core/SConscript.bootloader_ci
Unescape View File

@ -148,7 +148,6 @@ env.Replace(
'embed/models',
'embed/trezorhal',
'embed/extmod/modtrezorui',
'vendor/micropython/lib/cmsis/inc',
'vendor/nanopb',
] + CPPPATH_MOD + PATH_HAL,
CPPDEFINES=[

1
core/SConscript.firmware
Unescape View File

@ -440,7 +440,6 @@ env.Replace(
'embed/trezorhal',
'embed/extmod/modtrezorui',
'vendor/micropython',
'vendor/micropython/lib/cmsis/inc',
] + CPPPATH_MOD + PATH_HAL,
CPPDEFINES=[
'FIRMWARE',

1
core/SConscript.prodtest
Unescape View File

@ -148,7 +148,6 @@ env.Replace(
'embed/models',
'embed/trezorhal',
'embed/extmod/modtrezorui',
'vendor/micropython/lib/cmsis/inc',
] + CPPPATH_MOD + PATH_HAL,
CPPDEFINES=[
'TREZOR_PRODTEST',

1
core/SConscript.reflash
Unescape View File

@ -117,7 +117,6 @@ env.Replace(
'embed/models',
'embed/trezorhal',
'embed/extmod/modtrezorui',
'vendor/micropython/lib/cmsis/inc',
] + CPPPATH_MOD + PATH_HAL,
CPPDEFINES=[
'TREZOR_MODEL_'+TREZOR_MODEL,

1
core/embed/rust/build.rs
Unescape View File

@ -103,7 +103,6 @@ fn prepare_bindings() -> bindgen::Builder {
clang_args.push("-nostdinc");
clang_args.push("-I../firmware");
clang_args.push("-I../../build/firmware");
clang_args.push("-I../../vendor/micropython/lib/cmsis/inc");
clang_args.push("-DUSE_HAL_DRIVER");
bindings = bindings.clang_args(&clang_args);

8
core/site_scons/boards/discovery2.py
Unescape View File

@ -73,15 +73,11 @@ def configure(
"embed/trezorhal/stm32u5/usbd_core.c",
"embed/trezorhal/stm32u5/usbd_ctlreq.c",
"embed/trezorhal/stm32u5/usbd_ioreq.c",
"vendor/micropython/lib/stm32lib/STM32U5xx_HAL_Driver/Src/stm32u5xx_ll_usb.c",
"vendor/stm32cube-u5/Drivers/STM32U5xx_HAL_Driver/Src/stm32u5xx_ll_usb.c",
]
features_available.append("usb")
defines += [
"USE_DMA2D",
"FRAMEBUFFER"
"FRAMEBUFFER32BIT"
]
defines += ["USE_DMA2D", "FRAMEBUFFER" "FRAMEBUFFER32BIT"]
sources += [
"embed/trezorhal/stm32u5/dma2d.c",
]

2
core/site_scons/boards/stm32f4_common.py
Unescape View File

@ -8,6 +8,7 @@ def stm32f4_common_files(env, defines, sources, paths):
paths += [
"embed/trezorhal/stm32f4",
"vendor/micropython/lib/cmsis/inc",
"vendor/micropython/lib/stm32lib/STM32F4xx_HAL_Driver/Inc",
"vendor/micropython/lib/stm32lib/CMSIS/STM32F4xx/Include",
]
@ -65,6 +66,7 @@ def stm32f4_common_files(env, defines, sources, paths):
"-I../trezorhal/stm32f4;"
"-I../../vendor/micropython/lib/stm32lib/STM32F4xx_HAL_Driver/Inc;"
"-I../../vendor/micropython/lib/stm32lib/CMSIS/STM32F4xx/Include;"
"-I../../vendor/micropython/lib/cmsis/inc;"
"-DSTM32_HAL_H=<stm32f4xx.h>"
)

64
core/site_scons/boards/stm32u5_common.py
Unescape View File

@ -8,38 +8,39 @@ def stm32u5_common_files(env, defines, sources, paths):
paths += [
"embed/trezorhal/stm32u5",
"vendor/micropython/lib/stm32lib/STM32U5xx_HAL_Driver/Inc",
"vendor/micropython/lib/stm32lib/CMSIS/STM32U5xx/Include",
"vendor/stm32cube-u5/Drivers/STM32U5xx_HAL_Driver/Inc",
"vendor/stm32cube-u5/Drivers/CMSIS/Device/ST/STM32U5xx/Include",
"vendor/stm32cube-u5/Drivers/CMSIS/Core/Include",
]
sources += [
"vendor/micropython/lib/stm32lib/STM32U5xx_HAL_Driver/Src/stm32u5xx_hal.c",
"vendor/micropython/lib/stm32lib/STM32U5xx_HAL_Driver/Src/stm32u5xx_hal_cortex.c",
"vendor/micropython/lib/stm32lib/STM32U5xx_HAL_Driver/Src/stm32u5xx_hal_dma.c",
"vendor/micropython/lib/stm32lib/STM32U5xx_HAL_Driver/Src/stm32u5xx_hal_dma2d.c",
"vendor/micropython/lib/stm32lib/STM32U5xx_HAL_Driver/Src/stm32u5xx_hal_dsi.c",
"vendor/micropython/lib/stm32lib/STM32U5xx_HAL_Driver/Src/stm32u5xx_hal_flash.c",
"vendor/micropython/lib/stm32lib/STM32U5xx_HAL_Driver/Src/stm32u5xx_hal_flash_ex.c",
"vendor/micropython/lib/stm32lib/STM32U5xx_HAL_Driver/Src/stm32u5xx_hal_gfxmmu.c",
"vendor/micropython/lib/stm32lib/STM32U5xx_HAL_Driver/Src/stm32u5xx_hal_gpio.c",
"vendor/micropython/lib/stm32lib/STM32U5xx_HAL_Driver/Src/stm32u5xx_hal_i2c.c",
"vendor/micropython/lib/stm32lib/STM32U5xx_HAL_Driver/Src/stm32u5xx_hal_i2c_ex.c",
"vendor/micropython/lib/stm32lib/STM32U5xx_HAL_Driver/Src/stm32u5xx_hal_icache.c",
"vendor/micropython/lib/stm32lib/STM32U5xx_HAL_Driver/Src/stm32u5xx_hal_ltdc.c",
"vendor/micropython/lib/stm32lib/STM32U5xx_HAL_Driver/Src/stm32u5xx_hal_ltdc_ex.c",
"vendor/micropython/lib/stm32lib/STM32U5xx_HAL_Driver/Src/stm32u5xx_hal_pcd.c",
"vendor/micropython/lib/stm32lib/STM32U5xx_HAL_Driver/Src/stm32u5xx_hal_pcd_ex.c",
"vendor/micropython/lib/stm32lib/STM32U5xx_HAL_Driver/Src/stm32u5xx_hal_pwr.c",
"vendor/micropython/lib/stm32lib/STM32U5xx_HAL_Driver/Src/stm32u5xx_hal_pwr_ex.c",
"vendor/micropython/lib/stm32lib/STM32U5xx_HAL_Driver/Src/stm32u5xx_hal_rcc.c",
"vendor/micropython/lib/stm32lib/STM32U5xx_HAL_Driver/Src/stm32u5xx_hal_rcc_ex.c",
"vendor/micropython/lib/stm32lib/STM32U5xx_HAL_Driver/Src/stm32u5xx_hal_sd.c",
"vendor/micropython/lib/stm32lib/STM32U5xx_HAL_Driver/Src/stm32u5xx_hal_spi.c",
"vendor/micropython/lib/stm32lib/STM32U5xx_HAL_Driver/Src/stm32u5xx_hal_sram.c",
"vendor/micropython/lib/stm32lib/STM32U5xx_HAL_Driver/Src/stm32u5xx_hal_tim.c",
"vendor/micropython/lib/stm32lib/STM32U5xx_HAL_Driver/Src/stm32u5xx_hal_tim_ex.c",
"vendor/micropython/lib/stm32lib/STM32U5xx_HAL_Driver/Src/stm32u5xx_ll_fmc.c",
"vendor/micropython/lib/stm32lib/STM32U5xx_HAL_Driver/Src/stm32u5xx_ll_sdmmc.c",
"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_dma.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_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_sd.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_hal_tim.c",
"vendor/stm32cube-u5/Drivers/STM32U5xx_HAL_Driver/Src/stm32u5xx_hal_tim_ex.c",
"vendor/stm32cube-u5/Drivers/STM32U5xx_HAL_Driver/Src/stm32u5xx_ll_fmc.c",
"vendor/stm32cube-u5/Drivers/STM32U5xx_HAL_Driver/Src/stm32u5xx_ll_sdmmc.c",
]
sources += [
@ -69,8 +70,9 @@ def stm32u5_common_files(env, defines, sources, paths):
env.get("ENV")["RUST_INCLUDES"] = (
"-I../trezorhal/stm32u5;"
"-I../../vendor/micropython/lib/stm32lib/STM32U5xx_HAL_Driver/Inc;"
"-I../../vendor/micropython/lib/stm32lib/CMSIS/STM32U5xx/Include;"
"-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;"
"-DSTM32_HAL_H=<stm32u5xx.h>"
)

1
core/vendor/stm32cube-u5 vendored
Unescape View File

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

1
vendor/stm32cube-u5 vendored

@ -0,0 +1 @@
Subproject commit 7942fc4ea05026e4e9ce72d680f704e9433bce42
Write Preview
Loading…
Cancel
Save