From 70ce4ba56f5d805e71c2b1de7334d6492b5e350a Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Sat, 22 Aug 2020 08:42:28 +1000
Subject: Revert "Add Kiibohd bootloader type to bootloader.mk (#9908)"
 (#10126)

This reverts commit e2d4cd1a41c667da186891e3dbaf535c6b0717df.
---
 keyboards/k_type/rules.mk | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

(limited to 'keyboards/k_type/rules.mk')

diff --git a/keyboards/k_type/rules.mk b/keyboards/k_type/rules.mk
index 176a28d86..56c4c606e 100644
--- a/keyboards/k_type/rules.mk
+++ b/keyboards/k_type/rules.mk
@@ -1,14 +1,28 @@
 # MCU name
 MCU = MK20DX256
 
+# 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
+#   - MK20DX256BLDR8 for Infinity ErgoDox with Kiibohd bootloader
+MCU_LDSCRIPT = MK20DX256BLDR8
+
 # Board: it should exist either in <chibios>/os/hal/boards/
 #  or <this_dir>/boards
 # This board was copied from PJRC_TEENSY_3_1. The only difference should be a
 # hack to ensure the watchdog has started before trying to disable it.
 BOARD = IC_TEENSY_3_1
 
-# Bootloader selection
-BOOTLOADER = kiibohd
+DFU_ARGS = -d 1c11:b007
+DFU_SUFFIX_ARGS = -p b007 -v 1c11
+
+BOOTLOADER = dfu
 
 # Build Options
 #   comment out to disable the options.
-- 
cgit v1.2.3