summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew-Fahmy <andrewj.fahmy@gmail.com>2021-12-07 22:36:39 -0600
committerGitHub <noreply@github.com>2021-12-07 20:36:39 -0800
commit755731f0ba98b9a0cf826cd3b6486dc9104a8824 (patch)
tree8073f25f3b958e0fba26fbebed1cbc77f2cd1489
parent7f90cb178159d22744ce44b5f6e2223980da5ac6 (diff)
Fix RESET not working for keyboards with Kiibohd bootloader (#15430)
-rw-r--r--docs/flashing.md2
-rw-r--r--platforms/chibios/bootloader.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/docs/flashing.md b/docs/flashing.md
index 2e69f246aa..f6b5ff78b2 100644
--- a/docs/flashing.md
+++ b/docs/flashing.md
@@ -290,7 +290,7 @@ Compatible flashers:
Flashing sequence:
1. Enter the bootloader using any of the following methods:
- * Tap the `RESET` keycode (this may only enter the MCU into a "secure" bootloader mode; see https://github.com/qmk/qmk_firmware/issues/6112)
+ * Tap the `RESET` keycode
* Press the `RESET` button on the PCB
2. Wait for the OS to detect the device
3. Flash a .bin file
diff --git a/platforms/chibios/bootloader.c b/platforms/chibios/bootloader.c
index 5cadadeeeb..58212948b0 100644
--- a/platforms/chibios/bootloader.c
+++ b/platforms/chibios/bootloader.c
@@ -123,7 +123,7 @@ void enter_bootloader_mode_if_requested(void) { /* Jumping to bootloader is not
# if defined(BOOTLOADER_KIIBOHD)
/* 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";
+const uint8_t sys_reset_to_loader_magic[] = "\xff\x00\x7fRESET TO LOADER\x7f\x00\xff\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00";
__attribute__((weak)) void bootloader_jump(void) {
void *volatile vbat = (void *)VBAT;
__builtin_memcpy(vbat, (const void *)sys_reset_to_loader_magic, sizeof(sys_reset_to_loader_magic));