diff options
author | Nick Brassel <nick@tzarc.org> | 2020-08-22 08:42:28 +1000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-08-21 15:42:28 -0700 |
commit | 70ce4ba56f5d805e71c2b1de7334d6492b5e350a (patch) | |
tree | b5ac7fc20ebae31861c24eeb56c7dc0acc4b7a19 /tmk_core | |
parent | 1b0272e801d5ed5fb9af6012376e0d23ca678acd (diff) | |
download | qmk_firmware-70ce4ba56f5d805e71c2b1de7334d6492b5e350a.tar.gz qmk_firmware-70ce4ba56f5d805e71c2b1de7334d6492b5e350a.zip |
Revert "Add Kiibohd bootloader type to bootloader.mk (#9908)" (#10126)
This reverts commit e2d4cd1a41c667da186891e3dbaf535c6b0717df.
Diffstat (limited to 'tmk_core')
-rw-r--r-- | tmk_core/chibios.mk | 2 | ||||
-rw-r--r-- | tmk_core/common/chibios/bootloader.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tmk_core/chibios.mk b/tmk_core/chibios.mk index 4c288646e..09aaddeef 100644 --- a/tmk_core/chibios.mk +++ b/tmk_core/chibios.mk | |||
@@ -324,7 +324,7 @@ bin: $(BUILD_DIR)/$(TARGET).bin sizeafter | |||
324 | flash: $(BUILD_DIR)/$(TARGET).bin cpfirmware sizeafter | 324 | flash: $(BUILD_DIR)/$(TARGET).bin cpfirmware sizeafter |
325 | ifneq ($(strip $(PROGRAM_CMD)),) | 325 | ifneq ($(strip $(PROGRAM_CMD)),) |
326 | $(PROGRAM_CMD) | 326 | $(PROGRAM_CMD) |
327 | else ifeq ($(strip $(BOOTLOADER)),kiibohd) | 327 | else ifeq ($(strip $(BOOTLOADER)),dfu) |
328 | $(call EXEC_DFU_UTIL) | 328 | $(call EXEC_DFU_UTIL) |
329 | else ifeq ($(strip $(MCU_FAMILY)),KINETIS) | 329 | else ifeq ($(strip $(MCU_FAMILY)),KINETIS) |
330 | $(call EXEC_TEENSY) | 330 | $(call EXEC_TEENSY) |
diff --git a/tmk_core/common/chibios/bootloader.c b/tmk_core/common/chibios/bootloader.c index 6833511c0..4cf5dae7e 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) { | |||
44 | #elif defined(KL2x) || defined(K20x) /* STM32_BOOTLOADER_ADDRESS */ | 44 | #elif defined(KL2x) || defined(K20x) /* STM32_BOOTLOADER_ADDRESS */ |
45 | /* Kinetis */ | 45 | /* Kinetis */ |
46 | 46 | ||
47 | # if defined(BOOTLOADER_KIIBOHD) | 47 | # if defined(KIIBOHD_BOOTLOADER) |
48 | /* Kiibohd Bootloader (MCHCK and Infinity KB) */ | 48 | /* Kiibohd Bootloader (MCHCK and Infinity KB) */ |
49 | # define SCB_AIRCR_VECTKEY_WRITEMAGIC 0x05FA0000 | 49 | # define SCB_AIRCR_VECTKEY_WRITEMAGIC 0x05FA0000 |
50 | const uint8_t sys_reset_to_loader_magic[] = "\xff\x00\x7fRESET TO LOADER\x7f\x00\xff"; | 50 | const uint8_t sys_reset_to_loader_magic[] = "\xff\x00\x7fRESET TO LOADER\x7f\x00\xff"; |
@@ -54,14 +54,14 @@ void bootloader_jump(void) { | |||
54 | SCB->AIRCR = SCB_AIRCR_VECTKEY_WRITEMAGIC | SCB_AIRCR_SYSRESETREQ_Msk; | 54 | SCB->AIRCR = SCB_AIRCR_VECTKEY_WRITEMAGIC | SCB_AIRCR_SYSRESETREQ_Msk; |
55 | } | 55 | } |
56 | 56 | ||
57 | # else /* defined(BOOTLOADER_KIIBOHD) */ | 57 | # else /* defined(KIIBOHD_BOOTLOADER) */ |
58 | /* Default for Kinetis - expecting an ARM Teensy */ | 58 | /* Default for Kinetis - expecting an ARM Teensy */ |
59 | # include "wait.h" | 59 | # include "wait.h" |
60 | void bootloader_jump(void) { | 60 | void bootloader_jump(void) { |
61 | wait_ms(100); | 61 | wait_ms(100); |
62 | __BKPT(0); | 62 | __BKPT(0); |
63 | } | 63 | } |
64 | # endif /* defined(BOOTLOADER_KIIBOHD) */ | 64 | # endif /* defined(KIIBOHD_BOOTLOADER) */ |
65 | 65 | ||
66 | #else /* neither STM32 nor KINETIS */ | 66 | #else /* neither STM32 nor KINETIS */ |
67 | __attribute__((weak)) void bootloader_jump(void) {} | 67 | __attribute__((weak)) void bootloader_jump(void) {} |