From bf2e4023d884faa070197b0a5de4896893de69c7 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Thu, 21 Jan 2021 15:58:33 +0100 Subject: [PATCH] fix(core): fix reflash build, remove qrcodegen where not used --- core/SConscript.bootloader | 1 - core/SConscript.bootloader_ci | 1 - core/SConscript.reflash | 4 +++- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/SConscript.bootloader b/core/SConscript.bootloader index 495b4a902..7039fd4d8 100644 --- a/core/SConscript.bootloader +++ b/core/SConscript.bootloader @@ -47,7 +47,6 @@ SOURCE_MOD += [ 'embed/extmod/modtrezorui/font_bitmap.c', 'embed/extmod/modtrezorui/font_roboto_regular_20.c', 'embed/extmod/modtrezorui/font_robotomono_regular_20.c', - 'embed/extmod/modtrezorui/qr-code-generator/qrcodegen.c', 'vendor/micropython/extmod/uzlib/adler32.c', 'vendor/micropython/extmod/uzlib/crc32.c', 'vendor/micropython/extmod/uzlib/tinflate.c', diff --git a/core/SConscript.bootloader_ci b/core/SConscript.bootloader_ci index 16d413efe..4d96d9696 100644 --- a/core/SConscript.bootloader_ci +++ b/core/SConscript.bootloader_ci @@ -47,7 +47,6 @@ SOURCE_MOD += [ 'embed/extmod/modtrezorui/font_bitmap.c', 'embed/extmod/modtrezorui/font_roboto_regular_20.c', 'embed/extmod/modtrezorui/font_robotomono_regular_20.c', - 'embed/extmod/modtrezorui/qr-code-generator/qrcodegen.c', 'vendor/micropython/extmod/uzlib/adler32.c', 'vendor/micropython/extmod/uzlib/crc32.c', 'vendor/micropython/extmod/uzlib/tinflate.c', diff --git a/core/SConscript.reflash b/core/SConscript.reflash index f3e43fb05..007863285 100644 --- a/core/SConscript.reflash +++ b/core/SConscript.reflash @@ -28,7 +28,6 @@ SOURCE_MOD += [ 'embed/extmod/modtrezorui/display.c', 'embed/extmod/modtrezorui/font_bitmap.c', 'embed/extmod/modtrezorui/font_roboto_bold_20.c', - 'embed/extmod/modtrezorui/qr-code-generator/qrcodegen.c', 'vendor/micropython/extmod/uzlib/adler32.c', 'vendor/micropython/extmod/uzlib/crc32.c', 'vendor/micropython/extmod/uzlib/tinflate.c', @@ -36,6 +35,7 @@ SOURCE_MOD += [ SOURCE_STMHAL = [ 'vendor/micropython/lib/stm32lib/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_cortex.c', + 'vendor/micropython/lib/stm32lib/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_dma.c', 'vendor/micropython/lib/stm32lib/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_flash_ex.c', 'vendor/micropython/lib/stm32lib/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_flash.c', 'vendor/micropython/lib/stm32lib/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_gpio.c', @@ -63,11 +63,13 @@ SOURCE_REFLASH = [ SOURCE_TREZORHAL = [ 'embed/trezorhal/common.c', + 'embed/trezorhal/dma.c', 'embed/trezorhal/flash.c', 'embed/trezorhal/mini_printf.c', 'embed/trezorhal/rng.c', 'embed/trezorhal/sbu.c', 'embed/trezorhal/sdcard.c', + 'embed/trezorhal/systick.c', 'embed/trezorhal/stm32.c', 'embed/trezorhal/touch.c', 'embed/trezorhal/usb.c',