diff options
| author | clearchris <clearchris@hotmail.com> | 2020-02-17 23:46:58 -0500 |
|---|---|---|
| committer | Kevin O'Connor <kevin@koconnor.net> | 2020-03-04 19:50:56 -0500 |
| commit | f87e29c7751a2549f9c2cab4fca77a4b3ad6a8d1 (patch) | |
| tree | f138f8458395d2d5fbbe79aa4101cc38518bb9ad /src/generic/armcm_boot.c | |
| parent | 79e2376993434f92434c55a9c0dc5418171acf0a (diff) | |
| download | kutter-f87e29c7751a2549f9c2cab4fca77a4b3ad6a8d1.tar.gz kutter-f87e29c7751a2549f9c2cab4fca77a4b3ad6a8d1.tar.xz kutter-f87e29c7751a2549f9c2cab4fca77a4b3ad6a8d1.zip | |
armcm_boot: Additional code for broken bootloaders
Explicitly disable the SysTick interrupt and explicitly set the stack
pointer, as some bootloaders aren't handling this correctly.
Signed-off-by: Chris Lombardi <clearchris@hotmail.com>
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
Diffstat (limited to 'src/generic/armcm_boot.c')
| -rw-r--r-- | src/generic/armcm_boot.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/generic/armcm_boot.c b/src/generic/armcm_boot.c index 261fb912..5631cb37 100644 --- a/src/generic/armcm_boot.c +++ b/src/generic/armcm_boot.c @@ -6,6 +6,7 @@ #include "armcm_boot.h" // DECL_ARMCM_IRQ #include "autoconf.h" // CONFIG_MCU +#include "board/internal.h" // SysTick #include "command.h" // DECL_CONSTANT_STR #include "misc.h" // dynmem_start @@ -15,6 +16,7 @@ DECL_CONSTANT_STR("MCU", CONFIG_MCU); // Symbols created by armcm_link.lds.S linker script extern uint32_t _data_start, _data_end, _data_flash; extern uint32_t _bss_start, _bss_end, _stack_start; +extern uint32_t _stack_end; /**************************************************************** @@ -25,6 +27,13 @@ extern uint32_t _bss_start, _bss_end, _stack_start; void ResetHandler(void) { + // Disable SysTick irq (for some bootloaders that don't) + SysTick->CTRL = SysTick_CTRL_CLKSOURCE_Msk; + + // Explicitly load the stack pointer (for some bootloaders that don't) + asm volatile("mov sp, %0" : : "r"(&_stack_end)); + barrier(); + // Copy global variables from flash to ram uint32_t count = (&_data_end - &_data_start) * 4; __builtin_memcpy(&_data_start, &_data_flash, count); |