mirror of
https://github.com/trezor/trezor-firmware.git
synced 2025-08-02 20:08:31 +00:00
perf(core/bootloader): remove optiga from bootloader
[no changelog]
This commit is contained in:
parent
f966119817
commit
fdc9cfdc94
@ -18,7 +18,6 @@ FEATURES_WANTED = [
|
|||||||
"dma2d",
|
"dma2d",
|
||||||
"input",
|
"input",
|
||||||
"iwdg",
|
"iwdg",
|
||||||
"optiga",
|
|
||||||
"power_manager",
|
"power_manager",
|
||||||
"rgb_led",
|
"rgb_led",
|
||||||
"rtc",
|
"rtc",
|
||||||
@ -142,7 +141,7 @@ SOURCE_BOOTLOADER = [
|
|||||||
'embed/projects/bootloader/version_check.c',
|
'embed/projects/bootloader/version_check.c',
|
||||||
]
|
]
|
||||||
|
|
||||||
if 'optiga' in FEATURES_AVAILABLE:
|
if ('LOCKABLE_BOOTLOADER', '1') in CPPDEFINES_HAL:
|
||||||
SOURCE_BOOTLOADER += [
|
SOURCE_BOOTLOADER += [
|
||||||
'embed/projects/bootloader/workflow/wf_unlock_bootloader.c',
|
'embed/projects/bootloader/workflow/wf_unlock_bootloader.c',
|
||||||
]
|
]
|
||||||
|
@ -11,7 +11,6 @@ FEATURES_WANTED = [
|
|||||||
"consumption_mask",
|
"consumption_mask",
|
||||||
"display",
|
"display",
|
||||||
"input",
|
"input",
|
||||||
"optiga",
|
|
||||||
"powerctl",
|
"powerctl",
|
||||||
"rgb_led",
|
"rgb_led",
|
||||||
"usb",
|
"usb",
|
||||||
|
@ -24,7 +24,6 @@ FEATURES_WANTED = [
|
|||||||
"display",
|
"display",
|
||||||
"dma2d",
|
"dma2d",
|
||||||
"input",
|
"input",
|
||||||
"optiga",
|
|
||||||
"power_manager",
|
"power_manager",
|
||||||
"rgb_led",
|
"rgb_led",
|
||||||
]
|
]
|
||||||
@ -139,7 +138,7 @@ env = Environment(
|
|||||||
|
|
||||||
FEATURES_AVAILABLE = models.configure_board(TREZOR_MODEL, HW_REVISION, FEATURES_WANTED, env, CPPDEFINES_HAL, SOURCE_UNIX, PATH_HAL)
|
FEATURES_AVAILABLE = models.configure_board(TREZOR_MODEL, HW_REVISION, FEATURES_WANTED, env, CPPDEFINES_HAL, SOURCE_UNIX, PATH_HAL)
|
||||||
|
|
||||||
if 'optiga' in FEATURES_AVAILABLE:
|
if ('LOCKABLE_BOOTLOADER', '1') in CPPDEFINES_HAL:
|
||||||
SOURCE_BOOTLOADER += [
|
SOURCE_BOOTLOADER += [
|
||||||
'embed/projects/bootloader/workflow/wf_unlock_bootloader.c',
|
'embed/projects/bootloader/workflow/wf_unlock_bootloader.c',
|
||||||
]
|
]
|
||||||
|
@ -38,9 +38,6 @@
|
|||||||
#ifdef USE_PVD
|
#ifdef USE_PVD
|
||||||
#include <sys/pvd.h>
|
#include <sys/pvd.h>
|
||||||
#endif
|
#endif
|
||||||
#ifdef USE_OPTIGA
|
|
||||||
#include <sec/optiga_hal.h>
|
|
||||||
#endif
|
|
||||||
#ifdef USE_TOUCH
|
#ifdef USE_TOUCH
|
||||||
#include <io/touch.h>
|
#include <io/touch.h>
|
||||||
#endif
|
#endif
|
||||||
@ -245,10 +242,6 @@ static void drivers_init(secbool manufacturing_mode,
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef USE_OPTIGA
|
|
||||||
optiga_hal_init();
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef USE_CONSUMPTION_MASK
|
#ifdef USE_CONSUMPTION_MASK
|
||||||
consumption_mask_init();
|
consumption_mask_init();
|
||||||
#endif
|
#endif
|
||||||
|
@ -106,12 +106,8 @@ void resume_secure_drivers() {
|
|||||||
secure_aes_init();
|
secure_aes_init();
|
||||||
#endif
|
#endif
|
||||||
#ifdef USE_OPTIGA
|
#ifdef USE_OPTIGA
|
||||||
#ifdef BOOTLOADER
|
|
||||||
optiga_hal_init();
|
|
||||||
#else
|
|
||||||
optiga_init_and_configure();
|
optiga_init_and_configure();
|
||||||
#endif
|
#endif
|
||||||
#endif
|
|
||||||
#if defined(USE_TROPIC) && !defined(BOOTLOADER)
|
#if defined(USE_TROPIC) && !defined(BOOTLOADER)
|
||||||
tropic_init();
|
tropic_init();
|
||||||
#endif
|
#endif
|
||||||
|
Loading…
Reference in New Issue
Block a user