From 0bfb6086158c64960f039524bbc2bb9e7bbee378 Mon Sep 17 00:00:00 2001
From: Fred Sundvik <fsundvik@gmail.com>
Date: Thu, 7 Jul 2016 19:56:55 +0300
Subject: [PATCH] Remove unhandled KC_BTLD, RESET should be used instead

---
 keyboards/chibios_test/keymaps/default/keymap.c     | 2 +-
 keyboards/infinity_ergodox/keymaps/default/keymap.c | 5 ++++-
 tmk_core/common/keycode.h                           | 5 -----
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/keyboards/chibios_test/keymaps/default/keymap.c b/keyboards/chibios_test/keymaps/default/keymap.c
index 239d7000..a362e2cc 100644
--- a/keyboards/chibios_test/keymaps/default/keymap.c
+++ b/keyboards/chibios_test/keymaps/default/keymap.c
@@ -18,7 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "chibios_test.h"
 
 const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    {{KC_CAPS}}, // test with KC_CAPS, KC_A, KC_BTLD
+    {{KC_CAPS}}, // test with KC_CAPS, KC_A, RESET
 };
 
 const uint16_t fn_actions[] = {
diff --git a/keyboards/infinity_ergodox/keymaps/default/keymap.c b/keyboards/infinity_ergodox/keymaps/default/keymap.c
index c33fb7b9..f1e6b1c8 100644
--- a/keyboards/infinity_ergodox/keymaps/default/keymap.c
+++ b/keyboards/infinity_ergodox/keymaps/default/keymap.c
@@ -18,6 +18,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "infinity_ergodox.h"
 
+// Workaround for old keymap format
+#define KC_RESET RESET
+
 const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KEYMAP(  // layer 0 : default
         // left hand
@@ -63,7 +66,7 @@ const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     KEYMAP(  // layer 2 : keyboard functions
         // left hand
-        BTLD,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,
+        RESET,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,
         TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, FN3,
         TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,
         TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,
diff --git a/tmk_core/common/keycode.h b/tmk_core/common/keycode.h
index 44819530..fc66dc0e 100644
--- a/tmk_core/common/keycode.h
+++ b/tmk_core/common/keycode.h
@@ -156,8 +156,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define KC_WSTP KC_WWW_STOP
 #define KC_WREF KC_WWW_REFRESH
 #define KC_WFAV KC_WWW_FAVORITES
-/* Jump to bootloader */
-#define KC_BTLD KC_BOOTLOADER
 /* Transparent */
 #define KC_TRANSPARENT  1
 #define KC_TRNS KC_TRANSPARENT
@@ -428,9 +426,6 @@ enum internal_special_keycodes {
     KC_MEDIA_FAST_FORWARD,
     KC_MEDIA_REWIND,    /* 0xBC */
 
-    /* Jump to bootloader */
-    KC_BOOTLOADER       = 0xBF,
-
     /* Fn key */
     KC_FN0              = 0xC0,
     KC_FN1,