summaryrefslogtreecommitdiffstats
path: root/tmk_core/common/chibios
diff options
context:
space:
mode:
authorNick Brassel <nick@tzarc.org>2020-08-22 08:42:28 +1000
committerGitHub <noreply@github.com>2020-08-21 15:42:28 -0700
commit70ce4ba56f5d805e71c2b1de7334d6492b5e350a (patch)
treeb5ac7fc20ebae31861c24eeb56c7dc0acc4b7a19 /tmk_core/common/chibios
parent1b0272e801d5ed5fb9af6012376e0d23ca678acd (diff)
Revert "Add Kiibohd bootloader type to bootloader.mk (#9908)" (#10126)
This reverts commit e2d4cd1a41c667da186891e3dbaf535c6b0717df.
Diffstat (limited to 'tmk_core/common/chibios')
-rw-r--r--tmk_core/common/chibios/bootloader.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/tmk_core/common/chibios/bootloader.c b/tmk_core/common/chibios/bootloader.c
index 6833511c0e..4cf5dae7e6 100644
--- a/tmk_core/common/chibios/bootloader.c
+++ b/tmk_core/common/chibios/bootloader.c
@@ -44,7 +44,7 @@ void enter_bootloader_mode_if_requested(void) {
#elif defined(KL2x) || defined(K20x) /* STM32_BOOTLOADER_ADDRESS */
/* Kinetis */
-# if defined(BOOTLOADER_KIIBOHD)
+# 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";
@@ -54,14 +54,14 @@ void bootloader_jump(void) {
SCB->AIRCR = SCB_AIRCR_VECTKEY_WRITEMAGIC | SCB_AIRCR_SYSRESETREQ_Msk;
}
-# else /* defined(BOOTLOADER_KIIBOHD) */
+# else /* defined(KIIBOHD_BOOTLOADER) */
/* Default for Kinetis - expecting an ARM Teensy */
# include "wait.h"
void bootloader_jump(void) {
wait_ms(100);
__BKPT(0);
}
-# endif /* defined(BOOTLOADER_KIIBOHD) */
+# endif /* defined(KIIBOHD_BOOTLOADER) */
#else /* neither STM32 nor KINETIS */
__attribute__((weak)) void bootloader_jump(void) {}