arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-03-27 13:35:44 +00:00
Code Issues Releases Wiki Activity

TEST: enable charging in bootloader & firmware

Browse Source
This commit is contained in:
tychovrahe 2025-03-06 08:17:29 +01:00
parent dbbf717eba
commit 41b33feedc
3 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/SConscript.bootloader
View File

@ -175,7 +175,7 @@ env.Replace(
'-fstack-protector-strong ' '-fstack-protector-strong '
+ env.get('ENV')["CPU_CCFLAGS"] + CCFLAGS_MOD, + env.get('ENV')["CPU_CCFLAGS"] + CCFLAGS_MOD,
CCFLAGS_QSTR='-DNO_QSTR -DN_X64 -DN_X86 -DN_THUMB', CCFLAGS_QSTR='-DNO_QSTR -DN_X64 -DN_X86 -DN_THUMB',
LINKFLAGS=['-Tbuild/bootloader/memory.ld', '-Wl,--gc-sections', '-Wl,-Map=build/bootloader/bootloader.map', '-Wl,--warn-common', '-Wl,--print-memory-usage'], LINKFLAGS=['-Tbuild/bootloader/memory.ld', '-Wl,--gc-sections', '-Wl,-Map=build/bootloader/bootloader.map', '-Wl,--warn-common', '-Wl,--print-memory-usage', '-Wl,--undefined=__errno'],
CPPPATH=ALLPATHS, CPPPATH=ALLPATHS,
CPPDEFINES=[ CPPDEFINES=[
'BOOTLOADER', 'BOOTLOADER',

17
core/embed/projects/bootloader/main.c
View File

@ -62,6 +62,10 @@
#ifdef USE_BLE #ifdef USE_BLE
#include <io/ble.h> #include <io/ble.h>
#endif #endif
#ifdef USE_POWERCTL
#include <sys/powerctl.h>
#include "../sys/powerctl/npm1300/npm1300.h"
#endif
#include "antiglitch.h" #include "antiglitch.h"
#include "bootui.h" #include "bootui.h"
@ -78,7 +82,7 @@ void failed_jump_to_firmware(void);
CONFIDENTIAL volatile secbool dont_optimize_out_true = sectrue; CONFIDENTIAL volatile secbool dont_optimize_out_true = sectrue;
CONFIDENTIAL void (*volatile firmware_jump_fn)(void) = failed_jump_to_firmware; CONFIDENTIAL void (*volatile firmware_jump_fn)(void) = failed_jump_to_firmware;
static void drivers_init(secbool *touch_initialized) { static secbool drivers_init(secbool *touch_initialized) {
random_delays_init(); random_delays_init();
#ifdef USE_PVD #ifdef USE_PVD
pvd_init(); pvd_init();
@ -113,6 +117,7 @@ static void drivers_init(secbool *touch_initialized) {
} }
#endif #endif
#ifdef USE_OPTIGA #ifdef USE_OPTIGA
optiga_hal_init(); optiga_hal_init();
#endif #endif
@ -128,6 +133,8 @@ static void drivers_init(secbool *touch_initialized) {
#ifdef USE_BLE #ifdef USE_BLE
ble_init(); ble_init();
#endif #endif
return manufacturing_mode;
} }
static void drivers_deinit(void) { static void drivers_deinit(void) {
@ -251,7 +258,7 @@ int bootloader_main(void) {
system_init(&rsod_panic_handler); system_init(&rsod_panic_handler);
drivers_init(&touch_initialized); secbool manufacturing_mode = drivers_init(&touch_initialized);
ui_screen_boot_stage_1(false); ui_screen_boot_stage_1(false);
@ -319,6 +326,12 @@ int bootloader_main(void) {
firmware_present_backup = firmware_present; firmware_present_backup = firmware_present;
} }
#ifdef USE_POWERCTL
if (sectrue != manufacturing_mode || sectrue != firmware_present) {
npm1300_set_charging(true);
}
#endif
#if PRODUCTION && !defined STM32U5 #if PRODUCTION && !defined STM32U5
// for STM32U5, this check is moved to boardloader // for STM32U5, this check is moved to boardloader
ensure_bootloader_min_version(); ensure_bootloader_min_version();

2
core/embed/projects/kernel/main.c
View File

@ -59,6 +59,7 @@
#ifdef USE_POWERCTL #ifdef USE_POWERCTL
#include <sys/powerctl.h> #include <sys/powerctl.h>
#include "../sys/powerctl/npm1300/npm1300.h"
#endif #endif
#ifdef USE_PVD #ifdef USE_PVD
@ -92,6 +93,7 @@
void drivers_init() { void drivers_init() {
#ifdef USE_POWERCTL #ifdef USE_POWERCTL
powerctl_init(); powerctl_init();
npm1300_set_charging(true);
#endif #endif
#ifdef USE_TAMPER #ifdef USE_TAMPER