From 9770f5a4f628e1f49e4575db74c20bdb0963bb67 Mon Sep 17 00:00:00 2001 From: tychovrahe Date: Thu, 6 Mar 2025 10:07:09 +0100 Subject: [PATCH] T2W1 fixes --- core/SConscript.bootloader | 1 - core/site_scons/models/T2W1/t2w1.py | 3 --- core/site_scons/models/stm32f4_common.py | 1 + 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/core/SConscript.bootloader b/core/SConscript.bootloader index 0719f99870..7142c8d2e1 100644 --- a/core/SConscript.bootloader +++ b/core/SConscript.bootloader @@ -172,7 +172,6 @@ env.Replace( '-std=gnu11 -Wall -Werror -Wdouble-promotion -Wpointer-arith -Wno-missing-braces -fno-common ' '-fsingle-precision-constant -fdata-sections -ffunction-sections ' '-ffreestanding ' - '-fstack-protector-strong ' + env.get('ENV')["CPU_CCFLAGS"] + CCFLAGS_MOD, CCFLAGS_QSTR='-DNO_QSTR -DN_X64 -DN_X86 -DN_THUMB', LINKFLAGS=['-Tbuild/bootloader/memory.ld', '-Wl,--gc-sections', '-Wl,-Map=build/bootloader/bootloader.map', '-Wl,--warn-common', '-Wl,--print-memory-usage', '-Wl,--undefined=__errno'], diff --git a/core/site_scons/models/T2W1/t2w1.py b/core/site_scons/models/T2W1/t2w1.py index af86980c55..4646cfa775 100644 --- a/core/site_scons/models/T2W1/t2w1.py +++ b/core/site_scons/models/T2W1/t2w1.py @@ -75,9 +75,6 @@ def configure( sources += ["embed/io/sdcard/stm32f4/sdcard.c"] sources += ["embed/upymod/modtrezorio/ff.c"] sources += ["embed/upymod/modtrezorio/ffunicode.c"] - sources += [ - "vendor/micropython/lib/stm32lib/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_dma.c" - ] paths += ["embed/io/sdcard/inc"] features_available.append("sd_card") defines += [("USE_SD_CARD", "1")] diff --git a/core/site_scons/models/stm32f4_common.py b/core/site_scons/models/stm32f4_common.py index f1b744df41..aca80f9417 100644 --- a/core/site_scons/models/stm32f4_common.py +++ b/core/site_scons/models/stm32f4_common.py @@ -41,6 +41,7 @@ def stm32f4_common_files(env, defines, sources, paths): sources += [ "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_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_ex.c", "vendor/micropython/lib/stm32lib/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_gpio.c",