1
0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-12-18 20:38:10 +00:00

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

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

View File

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

View File

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

View File

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

View File

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

View File

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