From 55bfab3976bf72610c54b9ff01557e8fdb3da4a7 Mon Sep 17 00:00:00 2001 From: tychovrahe Date: Sat, 7 May 2022 09:19:29 +0200 Subject: [PATCH] build(core): skip bootloader and boardloader compilation for Model 1 --- core/SConscript.boardloader | 16 ++++++++++++---- core/SConscript.bootloader | 18 +++++++++++++----- core/SConscript.bootloader_ci | 16 ++++++++++++---- 3 files changed, 37 insertions(+), 13 deletions(-) diff --git a/core/SConscript.boardloader b/core/SConscript.boardloader index 0f00671e3..82d14cad4 100644 --- a/core/SConscript.boardloader +++ b/core/SConscript.boardloader @@ -4,6 +4,18 @@ import os TREZOR_MODEL = ARGUMENTS.get('TREZOR_MODEL', 'T') +if TREZOR_MODEL in ('1', ): + # skip boardloader build + env = Environment() + def build_boardloader(target,source,env): + print(f'Boardloader: nothing to build for Model {TREZOR_MODEL}') + program_bin = env.Command( + target='boardloader.bin', + source=None, + action=build_boardloader + ) + Return() + CCFLAGS_MOD = '' CPPPATH_MOD = [] CPPDEFINES_MOD = [] @@ -101,10 +113,6 @@ if TREZOR_MODEL in ('T', 'R'): CPU_ASFLAGS = '-mthumb -mcpu=cortex-m4 -mfloat-abi=hard -mfpu=fpv4-sp-d16' CPU_CCFLAGS = '-mthumb -mcpu=cortex-m4 -mfloat-abi=hard -mfpu=fpv4-sp-d16 -mtune=cortex-m4 ' CPU_MODEL = 'STM32F427xx' -elif TREZOR_MODEL in ('1',): - CPU_ASFLAGS = '-mthumb -mcpu=cortex-m3 -mfloat-abi=soft' - CPU_CCFLAGS = '-mthumb -mtune=cortex-m3 -mcpu=cortex-m3 -mfloat-abi=soft ' - CPU_MODEL = 'STM32F405xx' else: raise ValueError('Unknown Trezor model') diff --git a/core/SConscript.bootloader b/core/SConscript.bootloader index 7e5e00b05..86f8936f2 100644 --- a/core/SConscript.bootloader +++ b/core/SConscript.bootloader @@ -4,6 +4,18 @@ import os TREZOR_MODEL = ARGUMENTS.get('TREZOR_MODEL', 'T') +if TREZOR_MODEL in ('1', ): + # skip bootloader build + env = Environment() + def build_bootloader(target,source,env): + print(f'Bootloader: nothing to build for Model {TREZOR_MODEL}') + program_bin = env.Command( + target='bootloader.bin', + source=None, + action=build_bootloader + ) + Return() + CCFLAGS_MOD = '' CPPPATH_MOD = [] CPPDEFINES_MOD = [] @@ -111,7 +123,7 @@ SOURCE_TREZORHAL = [ 'embed/trezorhal/vectortable.s', ] -if TREZOR_MODEL in ('1', 'R'): +if TREZOR_MODEL in ('R'): SOURCE_TREZORHAL.append('embed/trezorhal/button.c') if TREZOR_MODEL in ('T',): SOURCE_TREZORHAL.append('embed/trezorhal/touch.c') @@ -135,10 +147,6 @@ if TREZOR_MODEL in ('T', 'R'): CPU_ASFLAGS = '-mthumb -mcpu=cortex-m4 -mfloat-abi=hard -mfpu=fpv4-sp-d16' CPU_CCFLAGS = '-mthumb -mcpu=cortex-m4 -mfloat-abi=hard -mfpu=fpv4-sp-d16 -mtune=cortex-m4 ' CPU_MODEL = 'STM32F427xx' -elif TREZOR_MODEL in ('1',): - CPU_ASFLAGS = '-mthumb -mcpu=cortex-m3 -mfloat-abi=soft' - CPU_CCFLAGS = '-mthumb -mtune=cortex-m3 -mcpu=cortex-m3 -mfloat-abi=soft ' - CPU_MODEL = 'STM32F405xx' else: raise ValueError('Unknown Trezor model') diff --git a/core/SConscript.bootloader_ci b/core/SConscript.bootloader_ci index f2eb9f2cb..6c358cee7 100644 --- a/core/SConscript.bootloader_ci +++ b/core/SConscript.bootloader_ci @@ -4,6 +4,18 @@ import os TREZOR_MODEL = ARGUMENTS.get('TREZOR_MODEL', 'T') +if TREZOR_MODEL in ('1', ): + # skip bootloader_ci build + env = Environment() + def build_bootloader_ci(target,source,env): + print(f'Bootloader_ci: nothing to build for Model {TREZOR_MODEL}') + program_bin = env.Command( + target='bootloader_ci.bin', + source=None, + action=build_bootloader_ci + ) + Return() + CCFLAGS_MOD = '' CPPPATH_MOD = [] CPPDEFINES_MOD = [] @@ -127,10 +139,6 @@ if TREZOR_MODEL in ('T', 'R'): CPU_ASFLAGS = '-mthumb -mcpu=cortex-m4 -mfloat-abi=hard -mfpu=fpv4-sp-d16' CPU_CCFLAGS = '-mthumb -mcpu=cortex-m4 -mfloat-abi=hard -mfpu=fpv4-sp-d16 -mtune=cortex-m4 ' CPU_MODEL = 'STM32F427xx' -elif TREZOR_MODEL in ('1',): - CPU_ASFLAGS = '-mthumb -mcpu=cortex-m3 -mfloat-abi=soft' - CPU_CCFLAGS = '-mthumb -mtune=cortex-m3 -mcpu=cortex-m3 -mfloat-abi=soft ' - CPU_MODEL = 'STM32F405xx' else: raise ValueError('Unknown Trezor model')