Merge branch 'chibios' of https://github.com/flabbergast/tmk_keyboard into flabbergas...

[max/tmk_keyboard.git] / tmk_core / common / chibios / bootloader.c

diff --git a/tmk_core/common/chibios/bootloader.c b/tmk_core/common/chibios/bootloader.c
index f36eced432ff1b50766e3b6ffc6a3ec366b05d4b..cac5220996ef6b35c629f774ae6051e3566aa5d2 100644 (file)
--- a/tmk_core/common/chibios/bootloader.c
+++ b/tmk_core/common/chibios/bootloader.c
@@ -1,8 +1,13 @@
 #include "bootloader.h"
 
 #include "ch.h"
+#include "hal.h"
 
 #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__;
 
@@ -10,7 +15,19 @@ void bootloader_jump(void) {
   *((unsigned long *)(SYMVAL(__ram0_end__) - 4)) = 0xDEADBEEF; // set magic flag => reset handler will jump into boot loader
    NVIC_SystemReset();
 }
-#else /* STM32_BOOTLOADER_ADDRESS */
-void bootloader_jump(void) {}
-#endif /* STM32_BOOTLOADER_ADDRESS */
 
+#else /* defined(STM32F0XX) */
+#error Check that the bootloader code works on your platform and add it to bootloader.c!
+#endif /* defined(STM32F0XX) */
+
+#elif defined(KL2x) || defined(K20x) /* STM32_BOOTLOADER_ADDRESS */
+/* Kinetis */
+
+void bootloader_jump(void) {
+       chThdSleepMilliseconds(100);
+       __BKPT(0);
+}
+
+#else /* neither STM32 nor KINETIS */
+void bootloader_jump(void) {}
+#endif
\ No newline at end of file