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

bootloader+firmware: call shutdown instead of inf-loop after main is finished

Browse Source
This commit is contained in:
Pavol Rusnak 2017-10-24 17:23:06 +02:00
parent abf7f822b8
commit 6e51ee251f
No known key found for this signature in database
GPG Key ID: 91F3B339B9A02A3D
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
embed/bootloader/main.c
View File

@ -281,7 +281,7 @@ int main(void)
// start the bootloader if user touched the screen or no firmware installed // start the bootloader if user touched the screen or no firmware installed
if (touched || !vendor_parse_header((const uint8_t *)FIRMWARE_START, &vhdr)) { if (touched || !vendor_parse_header((const uint8_t *)FIRMWARE_START, &vhdr)) {
if (!bootloader_loop()) { if (!bootloader_loop()) {
shutdown(); return 1;
} }
} }

3
embed/bootloader/startup.s
View File

@ -36,7 +36,6 @@ reset_handler:
// enter the application code // enter the application code
bl main bl main
// loop forever if the application code returns b shutdown
b .
.end .end

3
embed/firmware/startup.s
View File

@ -36,7 +36,6 @@ reset_handler:
// enter the application code // enter the application code
bl main bl main
// loop forever if the application code returns b shutdown
b .
.end .end