arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-12-18 12:28:09 +00:00
Code Issues Releases Wiki Activity

fix(core): fix DISC2 build

Browse Source 
[no changelog]
This commit is contained in:
tychovrahe 2024-05-19 15:26:36 +02:00 committed by TychoVrahe
parent ffe1ac7d7e
commit 76e98ecc3d
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/SConscript.bootloader_emu
View File

@ -8,7 +8,7 @@ CMAKELISTS = int(ARGUMENTS.get('CMAKELISTS', 0))
HW_REVISION = 'emulator' HW_REVISION = 'emulator'
NEW_RENDERING = ARGUMENTS.get('NEW_RENDERING', '1') == '1' NEW_RENDERING = ARGUMENTS.get('NEW_RENDERING', '1') == '1'
if TREZOR_MODEL in ('1', 'DISC1'): if TREZOR_MODEL in ('1', 'DISC1', 'DISC2'):
# skip bootloader build # skip bootloader build
env = Environment() env = Environment()
def build_bootloader(target,source,env): def build_bootloader(target,source,env):

12
core/site_scons/models/D002/discovery2.py
View File

@ -100,15 +100,15 @@ def configure(
features_available.append("framebuffer") features_available.append("framebuffer")
features_available.append("framebuffer32bit") features_available.append("framebuffer32bit")
if "new_rendering" in features_wanted:
defines += ["XFRAMEBUFFER"]
defines += ["DISPLAY_RGBA8888"]
features_available.append("xframebuffer")
features_available.append("display_rgba8888")
env.get("ENV")["LINKER_SCRIPT"] = linker_script env.get("ENV")["LINKER_SCRIPT"] = linker_script
defs = env.get("CPPDEFINES_IMPLICIT") defs = env.get("CPPDEFINES_IMPLICIT")
defs += ["__ARM_FEATURE_CMSE=3"] defs += ["__ARM_FEATURE_CMSE=3"]
rust_defs = env.get("ENV")["RUST_INCLUDES"]
rust_defs += "-DFRAMEBUFFER;"
if "new_rendering" in features_wanted:
rust_defs += "-DXFRAMEBUFFER;"
env.get("ENV")["RUST_INCLUDES"] = rust_defs
return features_available return features_available