X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=tmk_core%2Fcommon%2Fchibios%2Fbootloader.c;h=8a533ab6f652ccfeb7e8765876157eae89f2a340;hb=53bd4a01be5c4327462e6c6620ea7670eddca6f2;hp=cac5220996ef6b35c629f774ae6051e3566aa5d2;hpb=983d3be2da1231907aa735037b6b68717417b4a4;p=max%2Ftmk_keyboard.git

diff --git a/tmk_core/common/chibios/bootloader.c b/tmk_core/common/chibios/bootloader.c
index cac52209..8a533ab6 100644
--- a/tmk_core/common/chibios/bootloader.c
+++ b/tmk_core/common/chibios/bootloader.c
@@ -23,11 +23,25 @@ void bootloader_jump(void) {
 #elif defined(KL2x) || defined(K20x) /* STM32_BOOTLOADER_ADDRESS */
 /* Kinetis */
 
+#if defined(KIIBOHD_BOOTLOADER)
+/* Kiibohd Bootloader (MCHCK and Infinity KB) */
+#define SCB_AIRCR_VECTKEY_WRITEMAGIC 0x05FA0000
+const uint8_t sys_reset_to_loader_magic[] = "\xff\x00\x7fRESET TO LOADER\x7f\x00\xff";
+void bootloader_jump(void) {
+  __builtin_memcpy((void *)VBAT, (const void *)sys_reset_to_loader_magic, sizeof(sys_reset_to_loader_magic));
+  // request reset
+  SCB->AIRCR = SCB_AIRCR_VECTKEY_WRITEMAGIC | SCB_AIRCR_SYSRESETREQ_Msk;
+}
+
+#else /* defined(KIIBOHD_BOOTLOADER) */
+/* Default for Kinetis - expecting an ARM Teensy */
 void bootloader_jump(void) {
 	chThdSleepMilliseconds(100);
 	__BKPT(0);
 }
+#endif /* defined(KIIBOHD_BOOTLOADER) */
 
 #else /* neither STM32 nor KINETIS */
+__attribute__((weak))
 void bootloader_jump(void) {}
 #endif
\ No newline at end of file