diff --git a/core/SConscript.boardloader b/core/SConscript.boardloader index f4b20ed783..081ee6cf57 100644 --- a/core/SConscript.boardloader +++ b/core/SConscript.boardloader @@ -7,7 +7,12 @@ TREZOR_MODEL = ARGUMENTS.get('TREZOR_MODEL', 'T2T1') CMAKELISTS = int(ARGUMENTS.get('CMAKELISTS', 0)) HW_REVISION = ARGUMENTS.get('HW_REVISION', None) -FEATURES_WANTED = ["sd_card", "pmic", "display", "secure_domain"] +FEATURES_WANTED = [ + "display", + "pmic", + "sd_card", + "secure_domain", + ] CCFLAGS_MOD = '' CPPPATH_MOD = [] diff --git a/core/SConscript.bootloader b/core/SConscript.bootloader index 9e757a0cc3..866f3ad1b9 100644 --- a/core/SConscript.bootloader +++ b/core/SConscript.bootloader @@ -11,7 +11,20 @@ PRODUCTION = 0 if BOOTLOADER_QA else ARGUMENTS.get('PRODUCTION', '0') == '1' HW_REVISION = ARGUMENTS.get('HW_REVISION', None) UI_DEBUG_OVERLAY = ARGUMENTS.get('UI_DEBUG_OVERLAY', '0') == '1' -FEATURES_WANTED = ["input", "rgb_led", "consumption_mask", "usb", "optiga", "dma2d", "ble", "power_manager", "power_save", "display", "tropic", "secure_domain"] +FEATURES_WANTED = [ + "ble", + "consumption_mask", + "display", + "dma2d", + "input", + "optiga", + "power_manager", + "power_save", + "rgb_led", + "secure_domain", + "tropic", + "usb", + ] if TREZOR_MODEL in ('T3W1', ): FEATURES_WANTED += ["haptic"] diff --git a/core/SConscript.bootloader_ci b/core/SConscript.bootloader_ci index fd774f48db..7ccbad3ca1 100644 --- a/core/SConscript.bootloader_ci +++ b/core/SConscript.bootloader_ci @@ -7,7 +7,15 @@ TREZOR_MODEL = ARGUMENTS.get('TREZOR_MODEL', 'T2T1') CMAKELISTS = int(ARGUMENTS.get('CMAKELISTS', 0)) HW_REVISION = ARGUMENTS.get('HW_REVISION', None) -FEATURES_WANTED = ["input", "rgb_led", "consumption_mask", "usb", "optiga", "powerctl", "display"] +FEATURES_WANTED = [ + "consumption_mask", + "display", + "input", + "optiga", + "powerctl", + "rgb_led", + "usb", + ] CCFLAGS_MOD = '' CPPPATH_MOD = [] diff --git a/core/SConscript.bootloader_emu b/core/SConscript.bootloader_emu index 5665f029ce..9e7ba7ad65 100644 --- a/core/SConscript.bootloader_emu +++ b/core/SConscript.bootloader_emu @@ -20,7 +20,14 @@ if not models.has_emulator(TREZOR_MODEL): ) Return() -FEATURES_WANTED = ["input", "rgb_led", "dma2d", "optiga", "power_manager", "display"] +FEATURES_WANTED = [ + "display", + "dma2d", + "input", + "optiga", + "power_manager", + "rgb_led", + ] CCFLAGS_MOD = '' CPPPATH_MOD = [] diff --git a/core/SConscript.firmware b/core/SConscript.firmware index 1c1d0c2c10..e64ebbcf59 100644 --- a/core/SConscript.firmware +++ b/core/SConscript.firmware @@ -46,7 +46,21 @@ FEATURE_FLAGS = { "AES_GCM": BENCHMARK or THP, } -FEATURES_WANTED = ["input", "sd_card", "rgb_led", "dma2d", "consumption_mask", "usb" ,"optiga", "haptic", "ble", "tropic", "power_manager", "display", "secmon_layout"] +FEATURES_WANTED = [ + "ble", + "consumption_mask", + "display", + "dma2d", + "haptic", + "input", + "optiga", + "power_manager", + "rgb_led", + "sd_card", + "secmon_layout", + "tropic", + "usb", + ] if DISABLE_OPTIGA: if PYOPT != '0': diff --git a/core/SConscript.kernel b/core/SConscript.kernel index 9cd3f1cac3..7fdef9ae66 100644 --- a/core/SConscript.kernel +++ b/core/SConscript.kernel @@ -30,7 +30,23 @@ FEATURE_FLAGS = { "AES_GCM": True, } -FEATURES_WANTED = ["input", "sd_card", "rgb_led", "dma2d", "consumption_mask", "usb" ,"optiga", "haptic", "ble", "tropic", "power_manager", "power_save", "display", "applet", "secmon_layout"] +FEATURES_WANTED = [ + "applet", + "ble", + "consumption_mask", + "display", + "dma2d", + "haptic", + "input", + "optiga", + "power_manager", + "power_save", + "rgb_led", + "sd_card", + "secmon_layout", + "tropic", + "usb", + ] if DISABLE_OPTIGA: # TODO use PYOPT instead of PRODUCTION, same as in firmware, blocked on #4253 diff --git a/core/SConscript.prodtest b/core/SConscript.prodtest index f29ef67fdc..f043f3f127 100644 --- a/core/SConscript.prodtest +++ b/core/SConscript.prodtest @@ -14,7 +14,24 @@ FEATURE_FLAGS = { "AES_GCM": True, } -FEATURES_WANTED = ["input", "sbu", "nfc", "sd_card", "rgb_led", "usb", "consumption_mask", "optiga", "haptic", "tropic", "ble", "hw_revision", "power_manager", "power_save", "display", "secure_domain"] +FEATURES_WANTED = [ + "ble", + "consumption_mask", + "display", + "haptic", + "hw_revision", + "input", + "nfc", + "optiga", + "power_manager", + "power_save", + "rgb_led", + "sbu", + "sd_card", + "secure_domain", + "tropic", + "usb", + ] CCFLAGS_MOD = '' CPPPATH_MOD = [] diff --git a/core/SConscript.reflash b/core/SConscript.reflash index 2fc3b10545..763ee0fed9 100644 --- a/core/SConscript.reflash +++ b/core/SConscript.reflash @@ -18,7 +18,11 @@ if TREZOR_MODEL in ('D001', 'D002'): action=build_reflash) Return() -FEATURES_WANTED = ["input", "sd_card", "display"] +FEATURES_WANTED = [ + "display", + "input", + "sd_card", + ] CCFLAGS_MOD = '' CPPPATH_MOD = [] diff --git a/core/SConscript.secmon b/core/SConscript.secmon index 454cbebca1..a761f5c1c3 100644 --- a/core/SConscript.secmon +++ b/core/SConscript.secmon @@ -30,7 +30,14 @@ FEATURE_FLAGS = { "AES_GCM": True, } -FEATURES_WANTED = ["consumption_mask", "optiga", "power_save", "tropic", "secure_domain", "secmon_layout"] +FEATURES_WANTED = [ + "consumption_mask", + "optiga", + "power_save", + "secmon_layout", + "secure_domain", + "tropic", + ] if DISABLE_OPTIGA: # TODO use PYOPT instead of PRODUCTION, same as in firmware, blocked on #4253 diff --git a/core/SConscript.unix b/core/SConscript.unix index f65ef1a0c5..a882d5f444 100644 --- a/core/SConscript.unix +++ b/core/SConscript.unix @@ -22,7 +22,16 @@ if BENCHMARK and PYOPT != '0': print("BENCHMARK=1 works only with PYOPT=0.") exit(1) -FEATURES_WANTED = ["input", "sd_card", "dma2d", "optiga", "ble", "rgb_led", "powerctl", "display"] +FEATURES_WANTED = [ + "ble", + "display", + "dma2d", + "input", + "optiga", + "powerctl", + "rgb_led", + "sd_card", + ] if not DISABLE_TROPIC: FEATURES_WANTED.append('tropic')