summaryrefslogtreecommitdiff
path: root/tmk_core
diff options
context:
space:
mode:
authorFred Sundvik <fsundvik@gmail.com>2018-02-10 23:09:03 +0200
committerJack Humbert <jack.humb@gmail.com>2018-02-10 17:13:38 -0500
commit8c2ae4a4701439e98569dc2f2acee7016b4c0f20 (patch)
tree835e57a8f18b7a8259f24bbd5d8a3c784e843688 /tmk_core
parentfca31693df15f62cc3fd5851a0d1bae40eb179c2 (diff)
Fix reset for STM32 devices
Diffstat (limited to 'tmk_core')
-rw-r--r--tmk_core/common/chibios/bootloader.c34
1 files changed, 17 insertions, 17 deletions
diff --git a/tmk_core/common/chibios/bootloader.c b/tmk_core/common/chibios/bootloader.c
index fc17fca1b6..2dd3ade34e 100644
--- a/tmk_core/common/chibios/bootloader.c
+++ b/tmk_core/common/chibios/bootloader.c
@@ -6,32 +6,32 @@
#ifdef STM32_BOOTLOADER_ADDRESS
/* STM32 */
-#if defined(STM32F0XX)
/* This code should be checked whether it runs correctly on platforms */
#define SYMVAL(sym) (uint32_t)(((uint8_t *)&(sym)) - ((uint8_t *)0))
extern uint32_t __ram0_end__;
+#define BOOTLOADER_MAGIC 0xDEADBEEF
+#define MAGIC_ADDR (unsigned long*)(SYMVAL(__ram0_end__) - 4)
-void bootloader_jump(void) {
- *((unsigned long *)(SYMVAL(__ram0_end__) - 4)) = 0xDEADBEEF; // set magic flag => reset handler will jump into boot loader
- NVIC_SystemReset();
-}
-
-#elif defined(STM32F3XX)
-/* This code should be checked whether it runs correctly on platforms.
- * It was added for clueboard60 BUT HAS NOT BEEN TESTED.
- * FIXME - Test this
- */
-#define SYMVAL(sym) (uint32_t)(((uint8_t *)&(sym)) - ((uint8_t *)0))
-extern uint32_t __ram0_end__;
void bootloader_jump(void) {
- *((unsigned long *)(SYMVAL(__ram0_end__) - 4)) = 0xDEADBEEF; // set magic flag => reset handler will jump into boot loader
+ *MAGIC_ADDR = BOOTLOADER_MAGIC; // set magic flag => reset handler will jump into boot loader
NVIC_SystemReset();
}
-#else /* defined(STM32F0XX) */
-#error Check that the bootloader code works on your platform and add it to bootloader.c!
-#endif /* defined(STM32F0XX) */
+void enter_bootloader_mode_if_requested(void) {
+ unsigned long* check = MAGIC_ADDR;
+ if(*check == BOOTLOADER_MAGIC) {
+ *check = 0;
+ __set_CONTROL(0);
+ __set_MSP(*(__IO uint32_t*)STM32_BOOTLOADER_ADDRESS);
+ __enable_irq();
+
+ typedef void (*BootJump_t)(void);
+ BootJump_t boot_jump = *(BootJump_t*)(STM32_BOOTLOADER_ADDRESS + 4);
+ boot_jump();
+ while(1);
+ }
+ }
#elif defined(KL2x) || defined(K20x) /* STM32_BOOTLOADER_ADDRESS */
/* Kinetis */