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 /keyboards/infinity60 | |
| parent | 1b0272e801d5ed5fb9af6012376e0d23ca678acd (diff) | |
| download | firmware-70ce4ba56f5d805e71c2b1de7334d6492b5e350a.tar.gz firmware-70ce4ba56f5d805e71c2b1de7334d6492b5e350a.tar.bz2 firmware-70ce4ba56f5d805e71c2b1de7334d6492b5e350a.zip | |
Revert "Add Kiibohd bootloader type to bootloader.mk (#9908)" (#10126)
This reverts commit e2d4cd1a41c667da186891e3dbaf535c6b0717df.
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, 16 insertions, 2 deletions
diff --git a/keyboards/infinity60/bootloader_defs.h b/keyboards/infinity60/bootloader_defs.h new file mode 100644 index 000000000..c67153be6 --- /dev/null +++ b/keyboards/infinity60/bootloader_defs.h @@ -0,0 +1 @@ +#define KIIBOHD_BOOTLOADER diff --git a/keyboards/infinity60/rules.mk b/keyboards/infinity60/rules.mk index 8fb4b499e..579eab0f3 100644 --- a/keyboards/infinity60/rules.mk +++ b/keyboards/infinity60/rules.mk @@ -1,6 +1,17 @@ # MCU name MCU = MK20DX128 +# Linker script to use +# - it should exist either in <chibios>/os/common/ports/ARMCMx/compilers/GCC/ld/ +# or <this_dir>/ld/ +# - NOTE: a custom ld script is needed for EEPROM on Teensy LC +# - LDSCRIPT = +# - MKL26Z64 for Teensy LC +# - MK20DX128 for Teensy 3.0 +# - MK20DX256 for Teensy 3.1 and 3.2 +# - MK20DX128BLDR4 for Infinity with Kiibohd bootloader +MCU_LDSCRIPT = MK20DX128BLDR4 + # Board: it should exist either in <chibios>/os/hal/boards/ # or <this_dir>/boards # - BOARD = @@ -15,13 +26,15 @@ BOARD = MCHCK_K20 # The CORTEX_VTOR... is needed only for MCHCK/Infinity KB OPT_DEFS = -DCORTEX_VTOR_INIT=0x00001000 -# Bootloader selection -BOOTLOADER = kiibohd +BOOTLOADER = dfu # Build Options # comment out to disable the options. # +DFU_ARGS = -d 1c11:b007 +DFU_SUFFIX_ARGS = -p b007 -v 1c11 + BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration ## (Note that for BOOTMAGIC on Teensy LC you have to use a custom .ld script.) MOUSEKEY_ENABLE = yes # Mouse keys |