Merge remote-tracking branch 'upstream/master' into chibios

[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 fa9511282c29e49326a0e6f281bdb08b9946ffef..c8888f3cda87410461735749a3361daea45c39f4 100644 (file)
--- a/tmk_core/common/chibios/bootloader.c
+++ b/tmk_core/common/chibios/bootloader.c
@@ -25,13 +25,12 @@ void bootloader_jump(void) {
 
 #if defined(KIIBOHD_BOOTLOADER)
 /* Kiibohd Bootloader (MCHCK and Infinity KB) */
-#define SCB_AIRCR   (*(volatile uint32_t *)0xE000ED0C) // Application Interrupt and Reset Control
-#define VBAT        (*(volatile uint8_t  *)0x4003E000) // VBAT register file (32 bytes)
+#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));
+  __builtin_memcpy((void *)VBAT, (const void *)sys_reset_to_loader_magic, sizeof(sys_reset_to_loader_magic));
   // request reset
-  SCB_AIRCR = 0x05FA0004;
+  SCB->AIRCR = SCB_AIRCR_VECTKEY_WRITEMAGIC | SCB_AIRCR_SYSRESETREQ_Msk;
 }
 
 #else /* defined(KIIBOHD_BOOTLOADER) */