arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-12-18 12:28:09 +00:00
Code Issues Releases Wiki Activity

feat(core): add STM32CubeU5 submodule

Browse Source 
[no changelog]
This commit is contained in:
cepetr 2023-10-04 10:58:15 +02:00 committed by TychoVrahe
parent 4c40cb279c
commit 937b7d34d0
10 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@ -21,3 +21,6 @@
[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"]
path = vendor/stm32cube-u5
url = https://github.com/STMicroelectronics/STM32CubeU5.git

1
core/SConscript.bootloader
View File

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

1
core/SConscript.bootloader_ci
View File

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

1
core/SConscript.firmware
View File

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

1
core/SConscript.prodtest
View File

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

1
core/SConscript.reflash
View File

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

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

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

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

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

1
core/vendor/stm32cube-u5 vendored Symbolic link
View File

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

1
vendor/stm32cube-u5 vendored Submodule

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