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

build(core): add flag for disabling optiga on debug builds

Browse Source 
[skip_ci]
This commit is contained in:
Martin Milata 2023-11-13 16:52:37 +01:00
parent ebeea4a209
commit 1c69644fe0
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/Makefile
View File

@ -201,7 +201,9 @@ build_firmware: templates build_cross ## build firmware with frozen modules
$(SCONS) CFLAGS="$(CFLAGS)" PRODUCTION="$(PRODUCTION)" \ $(SCONS) CFLAGS="$(CFLAGS)" PRODUCTION="$(PRODUCTION)" \
TREZOR_MODEL="$(TREZOR_MODEL)" CMAKELISTS="$(CMAKELISTS)" \ TREZOR_MODEL="$(TREZOR_MODEL)" CMAKELISTS="$(CMAKELISTS)" \
PYOPT="$(PYOPT)" BITCOIN_ONLY="$(BITCOIN_ONLY)" \ PYOPT="$(PYOPT)" BITCOIN_ONLY="$(BITCOIN_ONLY)" \
BOOTLOADER_QA="$(BOOTLOADER_QA)" BOOTLOADER_DEVEL="$(BOOTLOADER_DEVEL)" $(FIRMWARE_BUILD_DIR)/firmware.bin BOOTLOADER_QA="$(BOOTLOADER_QA)" BOOTLOADER_DEVEL="$(BOOTLOADER_DEVEL)" \
DISABLE_OPTIGA="$(DISABLE_OPTIGA)" \
$(FIRMWARE_BUILD_DIR)/firmware.bin
build_unix: templates ## build unix port build_unix: templates ## build unix port
$(SCONS) CFLAGS="$(CFLAGS)" $(UNIX_BUILD_DIR)/trezor-emu-core $(UNIX_PORT_OPTS) \ $(SCONS) CFLAGS="$(CFLAGS)" $(UNIX_BUILD_DIR)/trezor-emu-core $(UNIX_PORT_OPTS) \

5
core/SConscript.firmware
View File

@ -11,6 +11,8 @@ BOOTLOADER_DEVEL = ARGUMENTS.get('BOOTLOADER_DEVEL', '0') == '1'
EVERYTHING = BITCOIN_ONLY != '1' EVERYTHING = BITCOIN_ONLY != '1'
TREZOR_MODEL = ARGUMENTS.get('TREZOR_MODEL', 'T') TREZOR_MODEL = ARGUMENTS.get('TREZOR_MODEL', 'T')
CMAKELISTS = int(ARGUMENTS.get('CMAKELISTS', 0)) CMAKELISTS = int(ARGUMENTS.get('CMAKELISTS', 0))
PYOPT = ARGUMENTS.get('PYOPT', '1')
DISABLE_OPTIGA = ARGUMENTS.get('DISABLE_OPTIGA', '0') == '1'
FEATURE_FLAGS = { FEATURE_FLAGS = {
@ -20,6 +22,8 @@ FEATURE_FLAGS = {
} }
FEATURES_WANTED = ["input", "sbu", "sd_card", "rgb_led", "dma2d", "consumption_mask", "usb" ,"optiga"] FEATURES_WANTED = ["input", "sbu", "sd_card", "rgb_led", "dma2d", "consumption_mask", "usb" ,"optiga"]
if DISABLE_OPTIGA and PYOPT == '0':
FEATURES_WANTED.remove("optiga")
CCFLAGS_MOD = '' CCFLAGS_MOD = ''
CPPPATH_MOD = [] CPPPATH_MOD = []
@ -29,7 +33,6 @@ CPPDEFINES_HAL = []
SOURCE_HAL = [] SOURCE_HAL = []
PATH_HAL = [] PATH_HAL = []
PYOPT = ARGUMENTS.get('PYOPT', '1')
FROZEN = True FROZEN = True
if TREZOR_MODEL in ('1', 'R'): if TREZOR_MODEL in ('1', 'R'):

1
core/embed/trezorhal/boards/trezor_r_v10.h
View File

@ -5,7 +5,6 @@
#define USE_SBU 1 #define USE_SBU 1
#define USE_I2C 1 #define USE_I2C 1
#define USE_CONSUMPTION_MASK 1 #define USE_CONSUMPTION_MASK 1
#define USE_OPTIGA 1
#include "displays/vg-2864ksweg01.h" #include "displays/vg-2864ksweg01.h"

2
core/site_scons/boards/trezor_r_v10.py
View File

@ -33,7 +33,6 @@ def configure(
defines += [f'TREZOR_BOARD=\\"boards/{board}\\"'] defines += [f'TREZOR_BOARD=\\"boards/{board}\\"']
defines += [f"HW_MODEL={hw_model}"] defines += [f"HW_MODEL={hw_model}"]
defines += [f"HW_REVISION={hw_revision}"] defines += [f"HW_REVISION={hw_revision}"]
defines += ["USE_OPTIGA=1"]
sources += [ sources += [
"embed/models/model_T2B1_layout.c", "embed/models/model_T2B1_layout.c",
] ]
@ -66,6 +65,7 @@ def configure(
features_available.append("usb") features_available.append("usb")
if "optiga" in features_wanted: if "optiga" in features_wanted:
defines += ["USE_OPTIGA=1"]
sources += ["embed/trezorhal/stm32f4/optiga_hal.c"] sources += ["embed/trezorhal/stm32f4/optiga_hal.c"]
sources += ["embed/trezorhal/optiga/optiga.c"] sources += ["embed/trezorhal/optiga/optiga.c"]
sources += ["embed/trezorhal/optiga/optiga_commands.c"] sources += ["embed/trezorhal/optiga/optiga_commands.c"]