diff options
| author | Ryan <fauxpark@gmail.com> | 2020-08-12 12:28:20 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-12 12:28:20 +1000 |
| commit | e2d4cd1a41c667da186891e3dbaf535c6b0717df (patch) | |
| tree | 8ae44fc6f6b80efb522ca523862ce511eab1161e /keyboards/infinity60 | |
| parent | 98e1e18f6bcae6977ef56747243158eb94c6bd69 (diff) | |
| download | qmk_firmware-e2d4cd1a41c667da186891e3dbaf535c6b0717df.tar.gz qmk_firmware-e2d4cd1a41c667da186891e3dbaf535c6b0717df.zip | |
Add Kiibohd bootloader type to bootloader.mk (#9908)
Diffstat (limited to 'keyboards/infinity60')
| -rw-r--r-- | keyboards/infinity60/bootloader_defs.h | 1 | ||||
| -rw-r--r-- | keyboards/infinity60/rules.mk | 17 |
2 files changed, 2 insertions, 16 deletions
diff --git a/keyboards/infinity60/bootloader_defs.h b/keyboards/infinity60/bootloader_defs.h deleted file mode 100644 index c67153be6..000000000 --- a/keyboards/infinity60/bootloader_defs.h +++ /dev/null | |||
| @@ -1 +0,0 @@ | |||
| 1 | #define KIIBOHD_BOOTLOADER | ||
diff --git a/keyboards/infinity60/rules.mk b/keyboards/infinity60/rules.mk index 579eab0f3..8fb4b499e 100644 --- a/keyboards/infinity60/rules.mk +++ b/keyboards/infinity60/rules.mk | |||
| @@ -1,17 +1,6 @@ | |||
| 1 | # MCU name | 1 | # MCU name |
| 2 | MCU = MK20DX128 | 2 | MCU = MK20DX128 |
| 3 | 3 | ||
| 4 | # Linker script to use | ||
| 5 | # - it should exist either in <chibios>/os/common/ports/ARMCMx/compilers/GCC/ld/ | ||
| 6 | # or <this_dir>/ld/ | ||
| 7 | # - NOTE: a custom ld script is needed for EEPROM on Teensy LC | ||
| 8 | # - LDSCRIPT = | ||
| 9 | # - MKL26Z64 for Teensy LC | ||
| 10 | # - MK20DX128 for Teensy 3.0 | ||
| 11 | # - MK20DX256 for Teensy 3.1 and 3.2 | ||
| 12 | # - MK20DX128BLDR4 for Infinity with Kiibohd bootloader | ||
| 13 | MCU_LDSCRIPT = MK20DX128BLDR4 | ||
| 14 | |||
| 15 | # Board: it should exist either in <chibios>/os/hal/boards/ | 4 | # Board: it should exist either in <chibios>/os/hal/boards/ |
| 16 | # or <this_dir>/boards | 5 | # or <this_dir>/boards |
| 17 | # - BOARD = | 6 | # - BOARD = |
| @@ -26,15 +15,13 @@ BOARD = MCHCK_K20 | |||
| 26 | # The CORTEX_VTOR... is needed only for MCHCK/Infinity KB | 15 | # The CORTEX_VTOR... is needed only for MCHCK/Infinity KB |
| 27 | OPT_DEFS = -DCORTEX_VTOR_INIT=0x00001000 | 16 | OPT_DEFS = -DCORTEX_VTOR_INIT=0x00001000 |
| 28 | 17 | ||
| 29 | BOOTLOADER = dfu | 18 | # Bootloader selection |
| 19 | BOOTLOADER = kiibohd | ||
| 30 | 20 | ||
| 31 | # Build Options | 21 | # Build Options |
| 32 | # comment out to disable the options. | 22 | # comment out to disable the options. |
| 33 | # | 23 | # |
| 34 | 24 | ||
| 35 | DFU_ARGS = -d 1c11:b007 | ||
| 36 | DFU_SUFFIX_ARGS = -p b007 -v 1c11 | ||
| 37 | |||
| 38 | BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration | 25 | BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration |
| 39 | ## (Note that for BOOTMAGIC on Teensy LC you have to use a custom .ld script.) | 26 | ## (Note that for BOOTMAGIC on Teensy LC you have to use a custom .ld script.) |
| 40 | MOUSEKEY_ENABLE = yes # Mouse keys | 27 | MOUSEKEY_ENABLE = yes # Mouse keys |
