arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-07-03 05:12:34 +00:00
Code Issues Releases Wiki Activity

trezorhal: implement jump_to function

Browse Source
This commit is contained in:
Pavol Rusnak 2017-03-29 20:50:45 +02:00
parent c8bff40ffb
commit 8d3020bc62
No known key found for this signature in database
GPG Key ID: 91F3B339B9A02A3D
4 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
micropython/bootloader/main.c
View File

@ -140,8 +140,7 @@ int main(void)
if (check_signature((const uint8_t *)LOADER_START)) { if (check_signature((const uint8_t *)LOADER_START)) {
BOOTLOADER_PRINTLN("valid loader signature"); BOOTLOADER_PRINTLN("valid loader signature");
BOOTLOADER_PRINTLN("JUMP!"); BOOTLOADER_PRINTLN("JUMP!");
// TODO: jump to loader jump_to(LOADER_START);
__fatal_error("halt");
} else { } else {
BOOTLOADER_PRINTLN("invalid loader signature"); BOOTLOADER_PRINTLN("invalid loader signature");
} }

6
micropython/loader/main.c
View File

@ -23,7 +23,11 @@ int main(void)
display_clear(); display_clear();
display_backlight(255); display_backlight(255);
__fatal_error("end reached"); LOADER_PRINTLN("reached loader");
HAL_Delay(1000);
LOADER_PRINTLN("jumping to firmware");
jump_to(FIRMWARE_START);
return 0; return 0;
} }

7
micropython/trezorhal/common.c
View File

@ -56,3 +56,10 @@ void periph_init(void) {
DWT->CYCCNT = 0; // Reset Cycle Count Register DWT->CYCCNT = 0; // Reset Cycle Count Register
DWT->CTRL |= DWT_CTRL_CYCCNTENA_Msk; // Enable Cycle Count Register DWT->CTRL |= DWT_CTRL_CYCCNTENA_Msk; // Enable Cycle Count Register
} }
void jump_to(uint32_t start)
{
SCB->VTOR = start;
__asm__ volatile("msr msp, %0"::"g" (*(volatile uint32_t *)start));
(*(void (**)())(start + 4))();
}

4
micropython/trezorhal/common.h
View File

@ -1,10 +1,14 @@
#ifndef __TREZORHAL_COMMON_H__ #ifndef __TREZORHAL_COMMON_H__
#define __TREZORHAL_COMMON_H__ #define __TREZORHAL_COMMON_H__
#include <stdint.h>
void periph_init(void); void periph_init(void);
void __attribute__((noreturn)) nlr_jump_fail(void *val); void __attribute__((noreturn)) nlr_jump_fail(void *val);
void __attribute__((noreturn)) __fatal_error(const char *msg); void __attribute__((noreturn)) __fatal_error(const char *msg);
void jump_to(uint32_t address);
#endif #endif