Commit 57b4dfa9 authored by Damien George's avatar Damien George
Browse files

stmhal: Fix pyb.bootloader so it works for gcc-4.9.0.

See PR #618.
parent 26a95ae1
...@@ -72,7 +72,12 @@ STATIC NORETURN mp_obj_t pyb_bootloader(void) { ...@@ -72,7 +72,12 @@ STATIC NORETURN mp_obj_t pyb_bootloader(void) {
HAL_DeInit(); HAL_DeInit();
__set_MSP(*((uint32_t*) 0x00000000));
// arm-none-eabi-gcc 4.9.0 does not correctly inline this
// MSP function, so we write it out explicitly here.
//__set_MSP(*((uint32_t*) 0x00000000));
__ASM volatile ("movs r3, #0\nldr r3, [r3, #0]\nMSR msp, r3\n" : : : "r3", "sp");
((void (*)(void)) *((uint32_t*) 0x00000004))(); ((void (*)(void)) *((uint32_t*) 0x00000004))();
while (1); while (1);
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment