arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-11-22 15:38:11 +00:00
Code Issues Releases Wiki Activity

embed: include files from vendor/micropython/ports/stm32 explicitly

Browse Source
This commit is contained in:
Pavol Rusnak 2019-01-24 19:30:16 +01:00
parent cfad075dcf
commit 1f61f82f63
No known key found for this signature in database
GPG Key ID: 91F3B339B9A02A3D
7 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
SConscript.boardloader
View File

@ -115,7 +115,6 @@ env.Replace(
'embed/trezorhal', 'embed/trezorhal',
'embed/extmod/modtrezorui', 'embed/extmod/modtrezorui',
'vendor/micropython/stmhal', 'vendor/micropython/stmhal',
'vendor/micropython/ports/stm32',
'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',
'vendor/micropython/lib/cmsis/inc', 'vendor/micropython/lib/cmsis/inc',

1
SConscript.bootloader
View File

@ -137,7 +137,6 @@ env.Replace(
'embed/bootloader/protob', 'embed/bootloader/protob',
'embed/trezorhal', 'embed/trezorhal',
'embed/extmod/modtrezorui', 'embed/extmod/modtrezorui',
'vendor/micropython/ports/stm32',
'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',
'vendor/micropython/lib/cmsis/inc', 'vendor/micropython/lib/cmsis/inc',

1
SConscript.firmware
View File

@ -330,7 +330,6 @@ env.Replace(
'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',
'vendor/micropython/lib/cmsis/inc', 'vendor/micropython/lib/cmsis/inc',
'vendor/micropython/ports/stm32',
] + CPPPATH_MOD, ] + CPPPATH_MOD,
CPPDEFINES=[ CPPDEFINES=[
('TREZOR_MODEL', '$TREZOR_MODEL'), ('TREZOR_MODEL', '$TREZOR_MODEL'),

1
SConscript.prodtest
View File

@ -115,7 +115,6 @@ env.Replace(
'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',
'vendor/micropython/lib/cmsis/inc', 'vendor/micropython/lib/cmsis/inc',
'vendor/micropython/ports/stm32',
] + CPPPATH_MOD, ] + CPPPATH_MOD,
CPPDEFINES=[ CPPDEFINES=[
('TREZOR_MODEL', '$TREZOR_MODEL'), ('TREZOR_MODEL', '$TREZOR_MODEL'),

9
SConscript.reflash
View File

@ -7,6 +7,14 @@ CPPPATH_MOD = []
CPPDEFINES_MOD = [] CPPDEFINES_MOD = []
SOURCE_MOD = [] SOURCE_MOD = []
# modtrezorcrypto
CPPPATH_MOD += [
'vendor/trezor-crypto',
]
SOURCE_MOD += [
'vendor/trezor-crypto/memzero.c',
]
# modtrezorui # modtrezorui
CPPDEFINES_MOD += [ CPPDEFINES_MOD += [
'TREZOR_FONT_BOLD_ENABLE', 'TREZOR_FONT_BOLD_ENABLE',
@ -107,7 +115,6 @@ env.Replace(
'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',
'vendor/micropython/lib/cmsis/inc', 'vendor/micropython/lib/cmsis/inc',
'vendor/micropython/ports/stm32',
] + CPPPATH_MOD, ] + CPPPATH_MOD,
CPPDEFINES=[ CPPDEFINES=[
('TREZOR_MODEL', '$TREZOR_MODEL'), ('TREZOR_MODEL', '$TREZOR_MODEL'),

4
embed/firmware/main.c
View File

@ -30,8 +30,8 @@
#include "py/mperrno.h" #include "py/mperrno.h"
#include "lib/utils/pyexec.h" #include "lib/utils/pyexec.h"
#include "gccollect.h" #include "ports/stm32/gccollect.h"
#include "pendsv.h" #include "ports/stm32/pendsv.h"
#include "common.h" #include "common.h"
#include "display.h" #include "display.h"

6
embed/trezorhal/systick.c
View File

@ -45,9 +45,9 @@
#include "py/runtime.h" #include "py/runtime.h"
#include "py/mphal.h" #include "py/mphal.h"
#include "irq.h" #include "ports/stm32/irq.h"
#include "systick.h" #include "ports/stm32/systick.h"
#include "pybthread.h" #include "ports/stm32/pybthread.h"
extern __IO uint32_t uwTick; extern __IO uint32_t uwTick;