Merge commit '71381457fa1311dfa0b58ba882a96db740640871'

[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 d19aab89a56701acfac6cccb5fa9e79d0e449ce3..8a533ab6f652ccfeb7e8765876157eae89f2a340 100644 (file)
--- a/tmk_core/common/chibios/bootloader.c
+++ b/tmk_core/common/chibios/bootloader.c
@@ -26,10 +26,9 @@ void bootloader_jump(void) {
 #if defined(KIIBOHD_BOOTLOADER)
 /* Kiibohd Bootloader (MCHCK and Infinity KB) */
 #define SCB_AIRCR_VECTKEY_WRITEMAGIC 0x05FA0000
-#define VBAT        (*(volatile uint8_t  *)0x4003E000) // VBAT register file (32 bytes)
 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 = SCB_AIRCR_VECTKEY_WRITEMAGIC | SCB_AIRCR_SYSRESETREQ_Msk;
 }
@@ -43,5 +42,6 @@ void bootloader_jump(void) {
 #endif /* defined(KIIBOHD_BOOTLOADER) */
 
 #else /* neither STM32 nor KINETIS */
+__attribute__((weak))
 void bootloader_jump(void) {}
 #endif
\ No newline at end of file