aboutsummaryrefslogtreecommitdiffstats
path: root/src/generic/armcm_boot.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/generic/armcm_boot.c')
-rw-r--r--src/generic/armcm_boot.c9
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);