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

fix(core/rust): convert bitcoin_only to an additive feature

Browse Source 
universal_fw enables more features, as opposed to bitcoin_only removing features
This commit is contained in:
matejcik 2024-03-07 13:27:41 +01:00 committed by matejcik
parent a433f8f914
commit ccf4b7e9eb
5 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/SConscript.bootloader
View File

@ -216,7 +216,6 @@ def cargo_build():
features = ["model_tr"] features = ["model_tr"]
else: else:
features = ["model_tt"] features = ["model_tt"]
features.append("bitcoin_only")
features.append("ui") features.append("ui")
features.append("bootloader") features.append("bootloader")
features.extend(FEATURES_AVAILABLE) features.extend(FEATURES_AVAILABLE)

1
core/SConscript.bootloader_emu
View File

@ -273,7 +273,6 @@ def cargo_build():
if TREZOR_MODEL in ('R', '1'): if TREZOR_MODEL in ('R', '1'):
features.append('button') features.append('button')
features.append("bitcoin_only")
features.append("ui") features.append("ui")
features.append("bootloader") features.append("bootloader")

4
core/SConscript.firmware
View File

@ -722,8 +722,8 @@ def cargo_build():
profile = '' profile = ''
features = ['micropython', 'protobuf', ui_layout_feature] features = ['micropython', 'protobuf', ui_layout_feature]
if BITCOIN_ONLY == '1': if EVERYTHING:
features.append('bitcoin_only') features.append('universal_fw')
features.append('ui') features.append('ui')
features.append('translations') features.append('translations')
if PYOPT == '0': if PYOPT == '0':

4
core/SConscript.unix
View File

@ -803,8 +803,8 @@ RUST_LIBPATH = f'{RUST_LIBDIR}/lib{RUST_LIB}.a'
def cargo_build(): def cargo_build():
features = ['micropython', 'protobuf', ui_layout_feature] features = ['micropython', 'protobuf', ui_layout_feature]
if BITCOIN_ONLY == '1': if EVERYTHING:
features.append('bitcoin_only') features.append('universal_fw')
features.append('ui') features.append('ui')
features.append('translations') features.append('translations')
if PYOPT == '0': if PYOPT == '0':

3
core/embed/rust/Cargo.toml
View File

@ -7,7 +7,6 @@ build = "build.rs"
[features] [features]
default = ["model_tt"] default = ["model_tt"]
bitcoin_only = []
crypto = ["zeroize"] crypto = ["zeroize"]
model_tt = ["jpeg"] model_tt = ["jpeg"]
model_tr = [] model_tr = []
@ -49,7 +48,9 @@ test = [
"backlight", "backlight",
"optiga", "optiga",
"translations", "translations",
"universal_fw",
] ]
universal_fw = []
[lib] [lib]
crate-type = ["staticlib"] crate-type = ["staticlib"]