From e69b638756c80c0a26efa1959b611a04548a9f82 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Tue, 23 Apr 2024 03:59:04 +0100
Subject: [PATCH] Migrate build target markers to keyboard.json - JK (#23588)

---
 .../jacky_studio/piggy60/rev2/{info.json => keyboard.json} | 0
 keyboards/janus/{info.json => keyboard.json}               | 0
 keyboards/jaykeeb/joker/{info.json => keyboard.json}       | 0
 keyboards/jaykeeb/joker/rules.mk                           | 1 -
 keyboards/jaykeeb/kamigakushi/{info.json => keyboard.json} | 0
 keyboards/jones/v03/{info.json => keyboard.json}           | 0
 keyboards/jones/v03_1/{info.json => keyboard.json}         | 0
 keyboards/joshajohnson/hub16/{info.json => keyboard.json}  | 0
 keyboards/jpe230/big_knob/{info.json => keyboard.json}     | 0
 keyboards/kagizaraya/chidori/{info.json => keyboard.json}  | 0
 keyboards/kagizaraya/scythe/{info.json => keyboard.json}   | 0
 keyboards/kakunpc/choc_taro/{info.json => keyboard.json}   | 0
 .../kakunpc/thedogkeyboard/{info.json => keyboard.json}    | 0
 keyboards/kaly/kaly42/{info.json => keyboard.json}         | 0
 keyboards/karn/{info.json => keyboard.json}                | 0
 keyboards/kb_elmo/aek2_usb/{info.json => keyboard.json}    | 0
 keyboards/kb_elmo/elmopad/{info.json => keyboard.json}     | 0
 keyboards/kb_elmo/isolation/{info.json => keyboard.json}   | 0
 keyboards/kb_elmo/m0110a_usb/{info.json => keyboard.json}  | 0
 keyboards/kb_elmo/m0116_usb/{info.json => keyboard.json}   | 0
 keyboards/kb_elmo/sesame/{info.json => keyboard.json}      | 0
 keyboards/kb_elmo/twelvekey/{info.json => keyboard.json}   | 0
 keyboards/kbdfans/jm60/{info.json => keyboard.json}        | 2 ++
 keyboards/kbdfans/jm60/rules.mk                            | 7 +------
 keyboards/kbdfans/kbd4x/{info.json => keyboard.json}       | 0
 .../kbdfans/kbd67/mkiirgb/v3/{info.json => keyboard.json}  | 0
 .../kbdfans/kbd67/mkiirgb_iso/{info.json => keyboard.json} | 0
 keyboards/kbdfans/niu_mini/{info.json => keyboard.json}    | 0
 keyboards/kbdfans/odin75/{info.json => keyboard.json}      | 0
 keyboards/kbdmania/kmac/{info.json => keyboard.json}       | 0
 keyboards/kbdmania/kmac_pad/{info.json => keyboard.json}   | 0
 .../kbnordic/nordic65/rev_a/{info.json => keyboard.json}   | 0
 .../keebio/cepstrum/rev1/{info.json => keyboard.json}      | 0
 keyboards/keebio/foldkb/rev1/{info.json => keyboard.json}  | 0
 keyboards/keebio/foldkb/rev1/rules.mk                      | 0
 keyboards/keebio/iris/rev8/{info.json => keyboard.json}    | 0
 keyboards/keebio/iris_ce/rev1/{info.json => keyboard.json} | 0
 .../keebio/levinson/rev3/{info.json => keyboard.json}      | 0
 keyboards/keebio/nyquist/rev4/{info.json => keyboard.json} | 0
 keyboards/keebio/sinc/rev3/{info.json => keyboard.json}    | 0
 keyboards/keebio/sinc/rev4/{info.json => keyboard.json}    | 0
 keyboards/keebio/wavelet/{info.json => keyboard.json}      | 0
 keyboards/keebwerk/mega/ansi/{info.json => keyboard.json}  | 0
 .../keebwerk/nano_slider/{info.json => keyboard.json}      | 0
 keyboards/keyboardio/model01/{info.json => keyboard.json}  | 0
 keyboards/keycapsss/3w6_2040/{info.json => keyboard.json}  | 0
 keyboards/keycult/keycult65/{info.json => keyboard.json}   | 0
 keyboards/keygem/kg60ansi/{info.json => keyboard.json}     | 0
 keyboards/keygem/kg65rgbv2/{info.json => keyboard.json}    | 0
 keyboards/keyhive/honeycomb/{info.json => keyboard.json}   | 0
 keyboards/keyhive/lattice60/{info.json => keyboard.json}   | 0
 keyboards/kin80/blackpill401/{info.json => keyboard.json}  | 5 ++++-
 keyboards/kin80/blackpill401/rules.mk                      | 1 -
 keyboards/kin80/blackpill411/{info.json => keyboard.json}  | 5 ++++-
 keyboards/kin80/blackpill411/rules.mk                      | 1 -
 keyboards/kinesis/alvicstep/{info.json => keyboard.json}   | 0
 keyboards/kinesis/kint41/{info.json => keyboard.json}      | 0
 keyboards/kinesis/kintlc/{info.json => keyboard.json}      | 0
 .../kinesis/nguyenvietyen/{info.json => keyboard.json}     | 0
 keyboards/kmini/{info.json => keyboard.json}               | 0
 .../kopibeng/mnk65_stm32/{info.json => keyboard.json}      | 0
 keyboards/kopibeng/xt87/{info.json => keyboard.json}       | 0
 keyboards/kopibeng/xt87/rules.mk                           | 2 --
 .../kprepublic/bm60hsrgb/rev2/{info.json => keyboard.json} | 0
 .../bm60hsrgb_iso/rev2/{info.json => keyboard.json}        | 0
 .../bm60hsrgb_poker/rev2/{info.json => keyboard.json}      | 0
 keyboards/ktec/ergodone/{info.json => keyboard.json}       | 0
 67 files changed, 11 insertions(+), 13 deletions(-)
 rename keyboards/jacky_studio/piggy60/rev2/{info.json => keyboard.json} (100%)
 rename keyboards/janus/{info.json => keyboard.json} (100%)
 rename keyboards/jaykeeb/joker/{info.json => keyboard.json} (100%)
 delete mode 100644 keyboards/jaykeeb/joker/rules.mk
 rename keyboards/jaykeeb/kamigakushi/{info.json => keyboard.json} (100%)
 rename keyboards/jones/v03/{info.json => keyboard.json} (100%)
 rename keyboards/jones/v03_1/{info.json => keyboard.json} (100%)
 rename keyboards/joshajohnson/hub16/{info.json => keyboard.json} (100%)
 rename keyboards/jpe230/big_knob/{info.json => keyboard.json} (100%)
 rename keyboards/kagizaraya/chidori/{info.json => keyboard.json} (100%)
 rename keyboards/kagizaraya/scythe/{info.json => keyboard.json} (100%)
 rename keyboards/kakunpc/choc_taro/{info.json => keyboard.json} (100%)
 rename keyboards/kakunpc/thedogkeyboard/{info.json => keyboard.json} (100%)
 rename keyboards/kaly/kaly42/{info.json => keyboard.json} (100%)
 rename keyboards/karn/{info.json => keyboard.json} (100%)
 rename keyboards/kb_elmo/aek2_usb/{info.json => keyboard.json} (100%)
 rename keyboards/kb_elmo/elmopad/{info.json => keyboard.json} (100%)
 rename keyboards/kb_elmo/isolation/{info.json => keyboard.json} (100%)
 rename keyboards/kb_elmo/m0110a_usb/{info.json => keyboard.json} (100%)
 rename keyboards/kb_elmo/m0116_usb/{info.json => keyboard.json} (100%)
 rename keyboards/kb_elmo/sesame/{info.json => keyboard.json} (100%)
 rename keyboards/kb_elmo/twelvekey/{info.json => keyboard.json} (100%)
 rename keyboards/kbdfans/jm60/{info.json => keyboard.json} (98%)
 rename keyboards/kbdfans/kbd4x/{info.json => keyboard.json} (100%)
 rename keyboards/kbdfans/kbd67/mkiirgb/v3/{info.json => keyboard.json} (100%)
 rename keyboards/kbdfans/kbd67/mkiirgb_iso/{info.json => keyboard.json} (100%)
 rename keyboards/kbdfans/niu_mini/{info.json => keyboard.json} (100%)
 rename keyboards/kbdfans/odin75/{info.json => keyboard.json} (100%)
 rename keyboards/kbdmania/kmac/{info.json => keyboard.json} (100%)
 rename keyboards/kbdmania/kmac_pad/{info.json => keyboard.json} (100%)
 rename keyboards/kbnordic/nordic65/rev_a/{info.json => keyboard.json} (100%)
 rename keyboards/keebio/cepstrum/rev1/{info.json => keyboard.json} (100%)
 rename keyboards/keebio/foldkb/rev1/{info.json => keyboard.json} (100%)
 delete mode 100644 keyboards/keebio/foldkb/rev1/rules.mk
 rename keyboards/keebio/iris/rev8/{info.json => keyboard.json} (100%)
 rename keyboards/keebio/iris_ce/rev1/{info.json => keyboard.json} (100%)
 rename keyboards/keebio/levinson/rev3/{info.json => keyboard.json} (100%)
 rename keyboards/keebio/nyquist/rev4/{info.json => keyboard.json} (100%)
 rename keyboards/keebio/sinc/rev3/{info.json => keyboard.json} (100%)
 rename keyboards/keebio/sinc/rev4/{info.json => keyboard.json} (100%)
 rename keyboards/keebio/wavelet/{info.json => keyboard.json} (100%)
 rename keyboards/keebwerk/mega/ansi/{info.json => keyboard.json} (100%)
 rename keyboards/keebwerk/nano_slider/{info.json => keyboard.json} (100%)
 rename keyboards/keyboardio/model01/{info.json => keyboard.json} (100%)
 rename keyboards/keycapsss/3w6_2040/{info.json => keyboard.json} (100%)
 rename keyboards/keycult/keycult65/{info.json => keyboard.json} (100%)
 rename keyboards/keygem/kg60ansi/{info.json => keyboard.json} (100%)
 rename keyboards/keygem/kg65rgbv2/{info.json => keyboard.json} (100%)
 rename keyboards/keyhive/honeycomb/{info.json => keyboard.json} (100%)
 rename keyboards/keyhive/lattice60/{info.json => keyboard.json} (100%)
 rename keyboards/kin80/blackpill401/{info.json => keyboard.json} (82%)
 delete mode 100644 keyboards/kin80/blackpill401/rules.mk
 rename keyboards/kin80/blackpill411/{info.json => keyboard.json} (82%)
 delete mode 100644 keyboards/kin80/blackpill411/rules.mk
 rename keyboards/kinesis/alvicstep/{info.json => keyboard.json} (100%)
 rename keyboards/kinesis/kint41/{info.json => keyboard.json} (100%)
 rename keyboards/kinesis/kintlc/{info.json => keyboard.json} (100%)
 rename keyboards/kinesis/nguyenvietyen/{info.json => keyboard.json} (100%)
 rename keyboards/kmini/{info.json => keyboard.json} (100%)
 rename keyboards/kopibeng/mnk65_stm32/{info.json => keyboard.json} (100%)
 rename keyboards/kopibeng/xt87/{info.json => keyboard.json} (100%)
 delete mode 100644 keyboards/kopibeng/xt87/rules.mk
 rename keyboards/kprepublic/bm60hsrgb/rev2/{info.json => keyboard.json} (100%)
 rename keyboards/kprepublic/bm60hsrgb_iso/rev2/{info.json => keyboard.json} (100%)
 rename keyboards/kprepublic/bm60hsrgb_poker/rev2/{info.json => keyboard.json} (100%)
 rename keyboards/ktec/ergodone/{info.json => keyboard.json} (100%)

diff --git a/keyboards/jacky_studio/piggy60/rev2/info.json b/keyboards/jacky_studio/piggy60/rev2/keyboard.json
similarity index 100%
rename from keyboards/jacky_studio/piggy60/rev2/info.json
rename to keyboards/jacky_studio/piggy60/rev2/keyboard.json
diff --git a/keyboards/janus/info.json b/keyboards/janus/keyboard.json
similarity index 100%
rename from keyboards/janus/info.json
rename to keyboards/janus/keyboard.json
diff --git a/keyboards/jaykeeb/joker/info.json b/keyboards/jaykeeb/joker/keyboard.json
similarity index 100%
rename from keyboards/jaykeeb/joker/info.json
rename to keyboards/jaykeeb/joker/keyboard.json
diff --git a/keyboards/jaykeeb/joker/rules.mk b/keyboards/jaykeeb/joker/rules.mk
deleted file mode 100644
index 6e7633bfe0..0000000000
--- a/keyboards/jaykeeb/joker/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/jaykeeb/kamigakushi/info.json b/keyboards/jaykeeb/kamigakushi/keyboard.json
similarity index 100%
rename from keyboards/jaykeeb/kamigakushi/info.json
rename to keyboards/jaykeeb/kamigakushi/keyboard.json
diff --git a/keyboards/jones/v03/info.json b/keyboards/jones/v03/keyboard.json
similarity index 100%
rename from keyboards/jones/v03/info.json
rename to keyboards/jones/v03/keyboard.json
diff --git a/keyboards/jones/v03_1/info.json b/keyboards/jones/v03_1/keyboard.json
similarity index 100%
rename from keyboards/jones/v03_1/info.json
rename to keyboards/jones/v03_1/keyboard.json
diff --git a/keyboards/joshajohnson/hub16/info.json b/keyboards/joshajohnson/hub16/keyboard.json
similarity index 100%
rename from keyboards/joshajohnson/hub16/info.json
rename to keyboards/joshajohnson/hub16/keyboard.json
diff --git a/keyboards/jpe230/big_knob/info.json b/keyboards/jpe230/big_knob/keyboard.json
similarity index 100%
rename from keyboards/jpe230/big_knob/info.json
rename to keyboards/jpe230/big_knob/keyboard.json
diff --git a/keyboards/kagizaraya/chidori/info.json b/keyboards/kagizaraya/chidori/keyboard.json
similarity index 100%
rename from keyboards/kagizaraya/chidori/info.json
rename to keyboards/kagizaraya/chidori/keyboard.json
diff --git a/keyboards/kagizaraya/scythe/info.json b/keyboards/kagizaraya/scythe/keyboard.json
similarity index 100%
rename from keyboards/kagizaraya/scythe/info.json
rename to keyboards/kagizaraya/scythe/keyboard.json
diff --git a/keyboards/kakunpc/choc_taro/info.json b/keyboards/kakunpc/choc_taro/keyboard.json
similarity index 100%
rename from keyboards/kakunpc/choc_taro/info.json
rename to keyboards/kakunpc/choc_taro/keyboard.json
diff --git a/keyboards/kakunpc/thedogkeyboard/info.json b/keyboards/kakunpc/thedogkeyboard/keyboard.json
similarity index 100%
rename from keyboards/kakunpc/thedogkeyboard/info.json
rename to keyboards/kakunpc/thedogkeyboard/keyboard.json
diff --git a/keyboards/kaly/kaly42/info.json b/keyboards/kaly/kaly42/keyboard.json
similarity index 100%
rename from keyboards/kaly/kaly42/info.json
rename to keyboards/kaly/kaly42/keyboard.json
diff --git a/keyboards/karn/info.json b/keyboards/karn/keyboard.json
similarity index 100%
rename from keyboards/karn/info.json
rename to keyboards/karn/keyboard.json
diff --git a/keyboards/kb_elmo/aek2_usb/info.json b/keyboards/kb_elmo/aek2_usb/keyboard.json
similarity index 100%
rename from keyboards/kb_elmo/aek2_usb/info.json
rename to keyboards/kb_elmo/aek2_usb/keyboard.json
diff --git a/keyboards/kb_elmo/elmopad/info.json b/keyboards/kb_elmo/elmopad/keyboard.json
similarity index 100%
rename from keyboards/kb_elmo/elmopad/info.json
rename to keyboards/kb_elmo/elmopad/keyboard.json
diff --git a/keyboards/kb_elmo/isolation/info.json b/keyboards/kb_elmo/isolation/keyboard.json
similarity index 100%
rename from keyboards/kb_elmo/isolation/info.json
rename to keyboards/kb_elmo/isolation/keyboard.json
diff --git a/keyboards/kb_elmo/m0110a_usb/info.json b/keyboards/kb_elmo/m0110a_usb/keyboard.json
similarity index 100%
rename from keyboards/kb_elmo/m0110a_usb/info.json
rename to keyboards/kb_elmo/m0110a_usb/keyboard.json
diff --git a/keyboards/kb_elmo/m0116_usb/info.json b/keyboards/kb_elmo/m0116_usb/keyboard.json
similarity index 100%
rename from keyboards/kb_elmo/m0116_usb/info.json
rename to keyboards/kb_elmo/m0116_usb/keyboard.json
diff --git a/keyboards/kb_elmo/sesame/info.json b/keyboards/kb_elmo/sesame/keyboard.json
similarity index 100%
rename from keyboards/kb_elmo/sesame/info.json
rename to keyboards/kb_elmo/sesame/keyboard.json
diff --git a/keyboards/kb_elmo/twelvekey/info.json b/keyboards/kb_elmo/twelvekey/keyboard.json
similarity index 100%
rename from keyboards/kb_elmo/twelvekey/info.json
rename to keyboards/kb_elmo/twelvekey/keyboard.json
diff --git a/keyboards/kbdfans/jm60/info.json b/keyboards/kbdfans/jm60/keyboard.json
similarity index 98%
rename from keyboards/kbdfans/jm60/info.json
rename to keyboards/kbdfans/jm60/keyboard.json
index c30b43b18b..4b0f960952 100644
--- a/keyboards/kbdfans/jm60/info.json
+++ b/keyboards/kbdfans/jm60/keyboard.json
@@ -19,6 +19,8 @@
         "extrakey": true,
         "nkro": true
     },
+    "bootloader": "custom",
+    "processor": "STM32F103",
     "community_layouts": ["60_ansi"],
     "layouts": {
         "LAYOUT_60_ansi": {
diff --git a/keyboards/kbdfans/jm60/rules.mk b/keyboards/kbdfans/jm60/rules.mk
index 0c31ad1eab..7b2a61d464 100644
--- a/keyboards/kbdfans/jm60/rules.mk
+++ b/keyboards/kbdfans/jm60/rules.mk
@@ -1,8 +1,3 @@
-# MCU name
-MCU = STM32F103
-
+# custom bootloader
 MCU_LDSCRIPT = jm60_bootloader
 BOARD = ST_NUCLEO64_F103RB
-
-# Bootloader selection
-BOOTLOADER = custom
diff --git a/keyboards/kbdfans/kbd4x/info.json b/keyboards/kbdfans/kbd4x/keyboard.json
similarity index 100%
rename from keyboards/kbdfans/kbd4x/info.json
rename to keyboards/kbdfans/kbd4x/keyboard.json
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v3/info.json b/keyboards/kbdfans/kbd67/mkiirgb/v3/keyboard.json
similarity index 100%
rename from keyboards/kbdfans/kbd67/mkiirgb/v3/info.json
rename to keyboards/kbdfans/kbd67/mkiirgb/v3/keyboard.json
diff --git a/keyboards/kbdfans/kbd67/mkiirgb_iso/info.json b/keyboards/kbdfans/kbd67/mkiirgb_iso/keyboard.json
similarity index 100%
rename from keyboards/kbdfans/kbd67/mkiirgb_iso/info.json
rename to keyboards/kbdfans/kbd67/mkiirgb_iso/keyboard.json
diff --git a/keyboards/kbdfans/niu_mini/info.json b/keyboards/kbdfans/niu_mini/keyboard.json
similarity index 100%
rename from keyboards/kbdfans/niu_mini/info.json
rename to keyboards/kbdfans/niu_mini/keyboard.json
diff --git a/keyboards/kbdfans/odin75/info.json b/keyboards/kbdfans/odin75/keyboard.json
similarity index 100%
rename from keyboards/kbdfans/odin75/info.json
rename to keyboards/kbdfans/odin75/keyboard.json
diff --git a/keyboards/kbdmania/kmac/info.json b/keyboards/kbdmania/kmac/keyboard.json
similarity index 100%
rename from keyboards/kbdmania/kmac/info.json
rename to keyboards/kbdmania/kmac/keyboard.json
diff --git a/keyboards/kbdmania/kmac_pad/info.json b/keyboards/kbdmania/kmac_pad/keyboard.json
similarity index 100%
rename from keyboards/kbdmania/kmac_pad/info.json
rename to keyboards/kbdmania/kmac_pad/keyboard.json
diff --git a/keyboards/kbnordic/nordic65/rev_a/info.json b/keyboards/kbnordic/nordic65/rev_a/keyboard.json
similarity index 100%
rename from keyboards/kbnordic/nordic65/rev_a/info.json
rename to keyboards/kbnordic/nordic65/rev_a/keyboard.json
diff --git a/keyboards/keebio/cepstrum/rev1/info.json b/keyboards/keebio/cepstrum/rev1/keyboard.json
similarity index 100%
rename from keyboards/keebio/cepstrum/rev1/info.json
rename to keyboards/keebio/cepstrum/rev1/keyboard.json
diff --git a/keyboards/keebio/foldkb/rev1/info.json b/keyboards/keebio/foldkb/rev1/keyboard.json
similarity index 100%
rename from keyboards/keebio/foldkb/rev1/info.json
rename to keyboards/keebio/foldkb/rev1/keyboard.json
diff --git a/keyboards/keebio/foldkb/rev1/rules.mk b/keyboards/keebio/foldkb/rev1/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/keyboards/keebio/iris/rev8/info.json b/keyboards/keebio/iris/rev8/keyboard.json
similarity index 100%
rename from keyboards/keebio/iris/rev8/info.json
rename to keyboards/keebio/iris/rev8/keyboard.json
diff --git a/keyboards/keebio/iris_ce/rev1/info.json b/keyboards/keebio/iris_ce/rev1/keyboard.json
similarity index 100%
rename from keyboards/keebio/iris_ce/rev1/info.json
rename to keyboards/keebio/iris_ce/rev1/keyboard.json
diff --git a/keyboards/keebio/levinson/rev3/info.json b/keyboards/keebio/levinson/rev3/keyboard.json
similarity index 100%
rename from keyboards/keebio/levinson/rev3/info.json
rename to keyboards/keebio/levinson/rev3/keyboard.json
diff --git a/keyboards/keebio/nyquist/rev4/info.json b/keyboards/keebio/nyquist/rev4/keyboard.json
similarity index 100%
rename from keyboards/keebio/nyquist/rev4/info.json
rename to keyboards/keebio/nyquist/rev4/keyboard.json
diff --git a/keyboards/keebio/sinc/rev3/info.json b/keyboards/keebio/sinc/rev3/keyboard.json
similarity index 100%
rename from keyboards/keebio/sinc/rev3/info.json
rename to keyboards/keebio/sinc/rev3/keyboard.json
diff --git a/keyboards/keebio/sinc/rev4/info.json b/keyboards/keebio/sinc/rev4/keyboard.json
similarity index 100%
rename from keyboards/keebio/sinc/rev4/info.json
rename to keyboards/keebio/sinc/rev4/keyboard.json
diff --git a/keyboards/keebio/wavelet/info.json b/keyboards/keebio/wavelet/keyboard.json
similarity index 100%
rename from keyboards/keebio/wavelet/info.json
rename to keyboards/keebio/wavelet/keyboard.json
diff --git a/keyboards/keebwerk/mega/ansi/info.json b/keyboards/keebwerk/mega/ansi/keyboard.json
similarity index 100%
rename from keyboards/keebwerk/mega/ansi/info.json
rename to keyboards/keebwerk/mega/ansi/keyboard.json
diff --git a/keyboards/keebwerk/nano_slider/info.json b/keyboards/keebwerk/nano_slider/keyboard.json
similarity index 100%
rename from keyboards/keebwerk/nano_slider/info.json
rename to keyboards/keebwerk/nano_slider/keyboard.json
diff --git a/keyboards/keyboardio/model01/info.json b/keyboards/keyboardio/model01/keyboard.json
similarity index 100%
rename from keyboards/keyboardio/model01/info.json
rename to keyboards/keyboardio/model01/keyboard.json
diff --git a/keyboards/keycapsss/3w6_2040/info.json b/keyboards/keycapsss/3w6_2040/keyboard.json
similarity index 100%
rename from keyboards/keycapsss/3w6_2040/info.json
rename to keyboards/keycapsss/3w6_2040/keyboard.json
diff --git a/keyboards/keycult/keycult65/info.json b/keyboards/keycult/keycult65/keyboard.json
similarity index 100%
rename from keyboards/keycult/keycult65/info.json
rename to keyboards/keycult/keycult65/keyboard.json
diff --git a/keyboards/keygem/kg60ansi/info.json b/keyboards/keygem/kg60ansi/keyboard.json
similarity index 100%
rename from keyboards/keygem/kg60ansi/info.json
rename to keyboards/keygem/kg60ansi/keyboard.json
diff --git a/keyboards/keygem/kg65rgbv2/info.json b/keyboards/keygem/kg65rgbv2/keyboard.json
similarity index 100%
rename from keyboards/keygem/kg65rgbv2/info.json
rename to keyboards/keygem/kg65rgbv2/keyboard.json
diff --git a/keyboards/keyhive/honeycomb/info.json b/keyboards/keyhive/honeycomb/keyboard.json
similarity index 100%
rename from keyboards/keyhive/honeycomb/info.json
rename to keyboards/keyhive/honeycomb/keyboard.json
diff --git a/keyboards/keyhive/lattice60/info.json b/keyboards/keyhive/lattice60/keyboard.json
similarity index 100%
rename from keyboards/keyhive/lattice60/info.json
rename to keyboards/keyhive/lattice60/keyboard.json
diff --git a/keyboards/kin80/blackpill401/info.json b/keyboards/kin80/blackpill401/keyboard.json
similarity index 82%
rename from keyboards/kin80/blackpill401/info.json
rename to keyboards/kin80/blackpill401/keyboard.json
index 7591d3f39c..1047c94458 100644
--- a/keyboards/kin80/blackpill401/info.json
+++ b/keyboards/kin80/blackpill401/keyboard.json
@@ -1,6 +1,9 @@
 {
     "usb": {
-        "device_version": "0.0.3"
+        "device_version": "0.0.3",
+        "shared_endpoint": {
+            "keyboard": true
+        }
     },
     "matrix_pins": {
         "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A5", "A6", "A7", "B0", "B1", "B10"],
diff --git a/keyboards/kin80/blackpill401/rules.mk b/keyboards/kin80/blackpill401/rules.mk
deleted file mode 100644
index 1071cf62ee..0000000000
--- a/keyboards/kin80/blackpill401/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-KEYBOARD_SHARED_EP = yes
diff --git a/keyboards/kin80/blackpill411/info.json b/keyboards/kin80/blackpill411/keyboard.json
similarity index 82%
rename from keyboards/kin80/blackpill411/info.json
rename to keyboards/kin80/blackpill411/keyboard.json
index a1486351ed..d1ac0a97f7 100644
--- a/keyboards/kin80/blackpill411/info.json
+++ b/keyboards/kin80/blackpill411/keyboard.json
@@ -1,6 +1,9 @@
 {
     "usb": {
-        "device_version": "0.0.3"
+        "device_version": "0.0.3",
+        "shared_endpoint": {
+            "keyboard": true
+        }
     },
     "matrix_pins": {
         "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A5", "A6", "A7", "B0", "B1", "B10"],
diff --git a/keyboards/kin80/blackpill411/rules.mk b/keyboards/kin80/blackpill411/rules.mk
deleted file mode 100644
index 1071cf62ee..0000000000
--- a/keyboards/kin80/blackpill411/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-KEYBOARD_SHARED_EP = yes
diff --git a/keyboards/kinesis/alvicstep/info.json b/keyboards/kinesis/alvicstep/keyboard.json
similarity index 100%
rename from keyboards/kinesis/alvicstep/info.json
rename to keyboards/kinesis/alvicstep/keyboard.json
diff --git a/keyboards/kinesis/kint41/info.json b/keyboards/kinesis/kint41/keyboard.json
similarity index 100%
rename from keyboards/kinesis/kint41/info.json
rename to keyboards/kinesis/kint41/keyboard.json
diff --git a/keyboards/kinesis/kintlc/info.json b/keyboards/kinesis/kintlc/keyboard.json
similarity index 100%
rename from keyboards/kinesis/kintlc/info.json
rename to keyboards/kinesis/kintlc/keyboard.json
diff --git a/keyboards/kinesis/nguyenvietyen/info.json b/keyboards/kinesis/nguyenvietyen/keyboard.json
similarity index 100%
rename from keyboards/kinesis/nguyenvietyen/info.json
rename to keyboards/kinesis/nguyenvietyen/keyboard.json
diff --git a/keyboards/kmini/info.json b/keyboards/kmini/keyboard.json
similarity index 100%
rename from keyboards/kmini/info.json
rename to keyboards/kmini/keyboard.json
diff --git a/keyboards/kopibeng/mnk65_stm32/info.json b/keyboards/kopibeng/mnk65_stm32/keyboard.json
similarity index 100%
rename from keyboards/kopibeng/mnk65_stm32/info.json
rename to keyboards/kopibeng/mnk65_stm32/keyboard.json
diff --git a/keyboards/kopibeng/xt87/info.json b/keyboards/kopibeng/xt87/keyboard.json
similarity index 100%
rename from keyboards/kopibeng/xt87/info.json
rename to keyboards/kopibeng/xt87/keyboard.json
diff --git a/keyboards/kopibeng/xt87/rules.mk b/keyboards/kopibeng/xt87/rules.mk
deleted file mode 100644
index a92b099328..0000000000
--- a/keyboards/kopibeng/xt87/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-# Enter lower-power sleep mode when on the ChibiOS idle thread
-OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/kprepublic/bm60hsrgb/rev2/info.json b/keyboards/kprepublic/bm60hsrgb/rev2/keyboard.json
similarity index 100%
rename from keyboards/kprepublic/bm60hsrgb/rev2/info.json
rename to keyboards/kprepublic/bm60hsrgb/rev2/keyboard.json
diff --git a/keyboards/kprepublic/bm60hsrgb_iso/rev2/info.json b/keyboards/kprepublic/bm60hsrgb_iso/rev2/keyboard.json
similarity index 100%
rename from keyboards/kprepublic/bm60hsrgb_iso/rev2/info.json
rename to keyboards/kprepublic/bm60hsrgb_iso/rev2/keyboard.json
diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev2/info.json b/keyboards/kprepublic/bm60hsrgb_poker/rev2/keyboard.json
similarity index 100%
rename from keyboards/kprepublic/bm60hsrgb_poker/rev2/info.json
rename to keyboards/kprepublic/bm60hsrgb_poker/rev2/keyboard.json
diff --git a/keyboards/ktec/ergodone/info.json b/keyboards/ktec/ergodone/keyboard.json
similarity index 100%
rename from keyboards/ktec/ergodone/info.json
rename to keyboards/ktec/ergodone/keyboard.json