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

bootloader: change stage2 to loader

Browse Source
This commit is contained in:
Pavol Rusnak 2017-03-21 16:06:22 +01:00
parent 9e5d61752c
commit 1e80e82bac
No known key found for this signature in database
GPG Key ID: 91F3B339B9A02A3D
3 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
micropython/bootloader/main.c
View File

@ -8,7 +8,7 @@
#include "display.h" #include "display.h"
#include "sdcard.h" #include "sdcard.h"
#define STAGE2_START 0x08010000 #define LOADER_START 0x08010000
#define BOOTLOADER_FGCOLOR 0xFFFF #define BOOTLOADER_FGCOLOR 0xFFFF
#define BOOTLOADER_BGCOLOR 0x0000 #define BOOTLOADER_BGCOLOR 0x0000
@ -78,7 +78,7 @@ bool copy_sdcard(void)
BOOTLOADER_PRINT("erasing flash "); BOOTLOADER_PRINT("erasing flash ");
// erase flash (except stage 1) // erase flash (except bootloader)
HAL_FLASH_Unlock(); HAL_FLASH_Unlock();
FLASH_EraseInitTypeDef EraseInitStruct; FLASH_EraseInitTypeDef EraseInitStruct;
__HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_EOP | FLASH_FLAG_OPERR | FLASH_FLAG_WRPERR | __HAL_FLASH_CLEAR_FLAG(FLASH_FLAG_EOP | FLASH_FLAG_OPERR | FLASH_FLAG_WRPERR |
@ -98,11 +98,11 @@ bool copy_sdcard(void)
} }
BOOTLOADER_PRINTLN(" done"); BOOTLOADER_PRINTLN(" done");
BOOTLOADER_PRINTLN("copying new stage 2 from SD card"); BOOTLOADER_PRINTLN("copying new loader from SD card");
sdcard_power_on(); sdcard_power_on();
// copy stage 2 from SD card to Flash // copy loader from SD card to Flash
uint32_t buf[SDCARD_BLOCK_SIZE / sizeof(uint32_t)]; uint32_t buf[SDCARD_BLOCK_SIZE / sizeof(uint32_t)];
sdcard_read_blocks((uint8_t *)buf, 0, 1); sdcard_read_blocks((uint8_t *)buf, 0, 1);
@ -115,7 +115,7 @@ bool copy_sdcard(void)
for (int i = 0; i < codelen / SDCARD_BLOCK_SIZE; i++) { for (int i = 0; i < codelen / SDCARD_BLOCK_SIZE; i++) {
sdcard_read_blocks((uint8_t *)buf, i, 1); sdcard_read_blocks((uint8_t *)buf, i, 1);
for (int j = 0; j < SDCARD_BLOCK_SIZE / sizeof(uint32_t); j++) { for (int j = 0; j < SDCARD_BLOCK_SIZE / sizeof(uint32_t); j++) {
if (HAL_FLASH_Program(TYPEPROGRAM_WORD, STAGE2_START + i * SDCARD_BLOCK_SIZE + j * sizeof(uint32_t), buf[j]) != HAL_OK) { if (HAL_FLASH_Program(TYPEPROGRAM_WORD, LOADER_START + i * SDCARD_BLOCK_SIZE + j * sizeof(uint32_t), buf[j]) != HAL_OK) {
BOOTLOADER_PRINTLN("copy failed"); BOOTLOADER_PRINTLN("copy failed");
sdcard_power_off(); sdcard_power_off();
HAL_FLASH_Lock(); HAL_FLASH_Lock();
@ -138,7 +138,7 @@ int main(void)
BOOTLOADER_PRINTLN("TREZOR Bootloader"); BOOTLOADER_PRINTLN("TREZOR Bootloader");
BOOTLOADER_PRINTLN("================="); BOOTLOADER_PRINTLN("=================");
BOOTLOADER_PRINTLN("starting stage 1"); BOOTLOADER_PRINTLN("starting bootloader");
if (check_sdcard()) { if (check_sdcard()) {
if (!copy_sdcard()) { if (!copy_sdcard()) {
@ -146,19 +146,19 @@ int main(void)
} }
} }
BOOTLOADER_PRINTLN("checking stage 2"); BOOTLOADER_PRINTLN("checking loader");
if (parse_header((const uint8_t *)STAGE2_START, NULL, NULL, NULL)) { if (parse_header((const uint8_t *)LOADER_START, NULL, NULL, NULL)) {
BOOTLOADER_PRINTLN("valid stage 2 header"); BOOTLOADER_PRINTLN("valid loader header");
if (check_signature((const uint8_t *)STAGE2_START)) { if (check_signature((const uint8_t *)LOADER_START)) {
BOOTLOADER_PRINTLN("valid stage 2 signature"); BOOTLOADER_PRINTLN("valid loader signature");
BOOTLOADER_PRINTLN("JUMP!"); BOOTLOADER_PRINTLN("JUMP!");
// TODO: jump to second stage // TODO: jump to loader
__fatal_error("halt"); __fatal_error("halt");
} else { } else {
BOOTLOADER_PRINTLN("invalid stage 2 signature"); BOOTLOADER_PRINTLN("invalid loader signature");
} }
} else { } else {
BOOTLOADER_PRINTLN("invalid stage 2 header"); BOOTLOADER_PRINTLN("invalid loader header");
} }
__fatal_error("halt"); __fatal_error("halt");

6
micropython/loader/main.c
View File

@ -5,6 +5,12 @@
#define FIRMWARE_START 0x08020000 #define FIRMWARE_START 0x08020000
#define LOADER_FGCOLOR 0xFFFF
#define LOADER_BGCOLOR 0x0000
#define LOADER_PRINT(X) do { display_print(X, -1); display_print_out(LOADER_FGCOLOR, LOADER_BGCOLOR); } while(0)
#define LOADER_PRINTLN(X) do { display_print(X "\n", -1); display_print_out(LOADER_FGCOLOR, LOADER_BGCOLOR); } while(0)
void pendsv_isr_handler(void) { void pendsv_isr_handler(void) {
__fatal_error("pendsv"); __fatal_error("pendsv");
} }

2
micropython/trezorhal/common.c
View File

@ -3,7 +3,7 @@
#include "display.h" #include "display.h"
#define FATAL_FGCOLOR 0xFFFF #define FATAL_FGCOLOR 0xFFFF
#define FATAL_BGCOLOR 0x001F #define FATAL_BGCOLOR 0x7800
void __attribute__((noreturn)) __fatal_error(const char *msg) { void __attribute__((noreturn)) __fatal_error(const char *msg) {
for (volatile uint32_t delay = 0; delay < 10000000; delay++) { for (volatile uint32_t delay = 0; delay < 10000000; delay++) {