arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-12-27 08:38:07 +00:00
Code Issues Releases Wiki Activity

core: move delay.c from trezorhal to firmware, fix prodtest build

Browse Source
This commit is contained in:
Pavol Rusnak 2019-12-15 08:59:47 +00:00
parent bd707a31b8
commit a9454b216d
No known key found for this signature in database
GPG Key ID: 91F3B339B9A02A3D
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/SConscript.firmware
View File

@ -301,6 +301,7 @@ SOURCE_STMHAL = [
SOURCE_FIRMWARE = [ SOURCE_FIRMWARE = [
'embed/firmware/bl_check.c', 'embed/firmware/bl_check.c',
'embed/firmware/delay.c',
'embed/firmware/header.S', 'embed/firmware/header.S',
'embed/firmware/main.c', 'embed/firmware/main.c',
'embed/firmware/mphalport.c', 'embed/firmware/mphalport.c',
@ -310,7 +311,6 @@ SOURCE_FIRMWARE = [
SOURCE_TREZORHAL = [ SOURCE_TREZORHAL = [
'embed/trezorhal/common.c', 'embed/trezorhal/common.c',
'embed/trezorhal/delay.c',
'embed/trezorhal/dma.c', 'embed/trezorhal/dma.c',
'embed/trezorhal/flash.c', 'embed/trezorhal/flash.c',
'embed/trezorhal/mini_printf.c', 'embed/trezorhal/mini_printf.c',

11
core/SConscript.prodtest
View File

@ -31,21 +31,22 @@ SOURCE_MOD += [
] ]
SOURCE_STMHAL = [ SOURCE_STMHAL = [
'vendor/micropython/lib/stm32lib/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal.c',
'vendor/micropython/lib/stm32lib/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_cortex.c', 'vendor/micropython/lib/stm32lib/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_cortex.c',
'vendor/micropython/lib/stm32lib/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_flash_ex.c', 'vendor/micropython/lib/stm32lib/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_dma.c',
'vendor/micropython/lib/stm32lib/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_flash.c', 'vendor/micropython/lib/stm32lib/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_flash.c',
'vendor/micropython/lib/stm32lib/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_flash_ex.c',
'vendor/micropython/lib/stm32lib/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_gpio.c', 'vendor/micropython/lib/stm32lib/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_gpio.c',
'vendor/micropython/lib/stm32lib/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_i2c.c', 'vendor/micropython/lib/stm32lib/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_i2c.c',
'vendor/micropython/lib/stm32lib/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_pcd_ex.c',
'vendor/micropython/lib/stm32lib/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_pcd.c', 'vendor/micropython/lib/stm32lib/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_pcd.c',
'vendor/micropython/lib/stm32lib/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_pcd_ex.c',
'vendor/micropython/lib/stm32lib/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_pwr.c', 'vendor/micropython/lib/stm32lib/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_pwr.c',
'vendor/micropython/lib/stm32lib/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_rcc.c', 'vendor/micropython/lib/stm32lib/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_rcc.c',
'vendor/micropython/lib/stm32lib/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_sd.c', 'vendor/micropython/lib/stm32lib/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_sd.c',
'vendor/micropython/lib/stm32lib/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_spi.c', 'vendor/micropython/lib/stm32lib/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_spi.c',
'vendor/micropython/lib/stm32lib/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_sram.c', 'vendor/micropython/lib/stm32lib/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_sram.c',
'vendor/micropython/lib/stm32lib/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_tim_ex.c',
'vendor/micropython/lib/stm32lib/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_tim.c', 'vendor/micropython/lib/stm32lib/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_tim.c',
'vendor/micropython/lib/stm32lib/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal.c', 'vendor/micropython/lib/stm32lib/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_tim_ex.c',
'vendor/micropython/lib/stm32lib/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_fmc.c', 'vendor/micropython/lib/stm32lib/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_fmc.c',
'vendor/micropython/lib/stm32lib/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_sdmmc.c', 'vendor/micropython/lib/stm32lib/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_sdmmc.c',
'vendor/micropython/lib/stm32lib/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_usb.c', 'vendor/micropython/lib/stm32lib/STM32F4xx_HAL_Driver/Src/stm32f4xx_ll_usb.c',
@ -59,12 +60,14 @@ SOURCE_PRODTEST = [
SOURCE_TREZORHAL = [ SOURCE_TREZORHAL = [
'embed/trezorhal/common.c', 'embed/trezorhal/common.c',
'embed/trezorhal/dma.c',
'embed/trezorhal/flash.c', 'embed/trezorhal/flash.c',
'embed/trezorhal/mini_printf.c', 'embed/trezorhal/mini_printf.c',
'embed/trezorhal/rng.c', 'embed/trezorhal/rng.c',
'embed/trezorhal/sbu.c', 'embed/trezorhal/sbu.c',
'embed/trezorhal/sdcard.c', 'embed/trezorhal/sdcard.c',
'embed/trezorhal/stm32.c', 'embed/trezorhal/stm32.c',
'embed/trezorhal/systick.c',
'embed/trezorhal/touch.c', 'embed/trezorhal/touch.c',
'embed/trezorhal/usb.c', 'embed/trezorhal/usb.c',
'embed/trezorhal/usbd_conf.c', 'embed/trezorhal/usbd_conf.c',

0
core/embed/trezorhal/delay.c → core/embed/firmware/delay.c
View File