Clueboard 60% support (#1746)

[qmk_firmware.git] / tmk_core / common / chibios / bootloader.c

diff --git a/tmk_core/common/chibios/bootloader.c b/tmk_core/common/chibios/bootloader.c
index 8a533ab6f652ccfeb7e8765876157eae89f2a340..fc17fca1b63b6fe6dfcf943931060d715a68c6ae 100644 (file)
--- a/tmk_core/common/chibios/bootloader.c
+++ b/tmk_core/common/chibios/bootloader.c
@@ -16,6 +16,19 @@ void bootloader_jump(void) {
    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
+   NVIC_SystemReset();
+}
+
 #else /* defined(STM32F0XX) */
 #error Check that the bootloader code works on your platform and add it to bootloader.c!
 #endif /* defined(STM32F0XX) */
@@ -35,8 +48,9 @@ void bootloader_jump(void) {
 
 #else /* defined(KIIBOHD_BOOTLOADER) */
 /* Default for Kinetis - expecting an ARM Teensy */
+#include "wait.h"
 void bootloader_jump(void) {
-       chThdSleepMilliseconds(100);
+       wait_ms(100);
        __BKPT(0);
 }
 #endif /* defined(KIIBOHD_BOOTLOADER) */
@@ -44,4 +58,4 @@ void bootloader_jump(void) {
 #else /* neither STM32 nor KINETIS */
 __attribute__((weak))
 void bootloader_jump(void) {}
-#endif
\ No newline at end of file
+#endif