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

bootloader: Allow building as an app

Browse Source
This commit is contained in:
Saleem Rashid 2017-06-10 19:36:58 +01:00 committed by Pavol Rusnak
parent 0b3373e6df
commit 80d17c1333
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bootloader/bootloader.c
View File

@ -34,10 +34,6 @@
#include "serialno.h" #include "serialno.h"
#include "rng.h" #include "rng.h"
#ifdef APPVER
#error Bootloader cannot be used in app mode
#endif
void layoutFirmwareHash(const uint8_t *hash) void layoutFirmwareHash(const uint8_t *hash)
{ {
char str[4][17]; char str[4][17];
@ -116,6 +112,7 @@ void bootloader_loop(void)
int check_firmware_sanity(void) int check_firmware_sanity(void)
{ {
#ifndef APPVER
if (memcmp((const void *)FLASH_META_MAGIC, "TRZR", 4)) { // magic does not match if (memcmp((const void *)FLASH_META_MAGIC, "TRZR", 4)) { // magic does not match
return 0; return 0;
} }
@ -125,6 +122,7 @@ int check_firmware_sanity(void)
if (*((const uint32_t *)FLASH_META_CODELEN) > FLASH_TOTAL_SIZE - (FLASH_APP_START - FLASH_ORIGIN)) { // firmware reports bigger size than flash size if (*((const uint32_t *)FLASH_META_CODELEN) > FLASH_TOTAL_SIZE - (FLASH_APP_START - FLASH_ORIGIN)) { // firmware reports bigger size than flash size
return 0; return 0;
} }
#endif
return 1; return 1;
} }
@ -138,13 +136,18 @@ void __attribute__((noreturn)) __stack_chk_fail(void)
int main(void) int main(void)
{ {
#ifndef APPVER
setup(); setup();
#endif
__stack_chk_guard = random32(); // this supports compiler provided unpredictable stack protection checks __stack_chk_guard = random32(); // this supports compiler provided unpredictable stack protection checks
#ifndef APPVER
memory_protect(); memory_protect();
oledInit(); oledInit();
#endif
firmware_present = check_firmware_sanity(); firmware_present = check_firmware_sanity();
#ifndef APPVER
// at least one button is unpressed // at least one button is unpressed
uint16_t state = gpio_port_read(BTN_PORT); uint16_t state = gpio_port_read(BTN_PORT);
int unpressed = ((state & BTN_PIN_YES) == BTN_PIN_YES || (state & BTN_PIN_NO) == BTN_PIN_NO); int unpressed = ((state & BTN_PIN_YES) == BTN_PIN_YES || (state & BTN_PIN_NO) == BTN_PIN_NO);
@ -164,6 +167,7 @@ int main(void)
load_app(); load_app();
} }
#endif
bootloader_loop(); bootloader_loop();