8 files changed, 12 insertions, 54 deletions
diff --git a/keyboards/input_club/ergodox_infinity/info.json b/keyboards/input_club/ergodox_infinity/info.json
index a01b6fd200..635355d490 100644
--- a/keyboards/input_club/ergodox_infinity/info.json
+++ b/keyboards/input_club/ergodox_infinity/info.json
@@ -6,6 +6,9 @@
         "pid": "0xB04D",
         "device_version": "0.0.1"
     },
+    "processor": "MK20DX256",
+    "bootloader": "kiibohd",
+    "board": "IC_TEENSY_3_1",
     "community_layouts": ["ergodox"],
     "layouts": {
       "LAYOUT_ergodox": {
diff --git a/keyboards/input_club/ergodox_infinity/rules.mk b/keyboards/input_club/ergodox_infinity/rules.mk
index aa1ff6980f..88bd6b0041 100644
--- a/keyboards/input_club/ergodox_infinity/rules.mk
+++ b/keyboards/input_club/ergodox_infinity/rules.mk
@@ -1,16 +1,3 @@
-# MCU name
-MCU = MK20DX256
-
-# Bootloader selection
-BOOTLOADER = kiibohd
-
-# 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, and an
-# override to disable restart of USB driver after returning from suspend.
-BOARD = IC_TEENSY_3_1
-
 # Build Options
 #   change yes to no to disable
 #
diff --git a/keyboards/input_club/infinity60/info.json b/keyboards/input_club/infinity60/info.json
index 58642a56ed..a1ee490098 100644
--- a/keyboards/input_club/infinity60/info.json
+++ b/keyboards/input_club/infinity60/info.json
@@ -8,6 +8,9 @@
         "pid": "0xB04D",
         "device_version": "0.0.1"
     },
+    "processor": "MK20DX128",
+    "bootloader": "kiibohd",
+    "board": "MCHCK_K20",
     "community_layouts": ["60_ansi_split_bs_rshift"],
     "layouts": {
         "LAYOUT_60_ansi_split_bs_rshift": {
diff --git a/keyboards/input_club/infinity60/rules.mk b/keyboards/input_club/infinity60/rules.mk
index 258a68f83e..e47069dac9 100644
--- a/keyboards/input_club/infinity60/rules.mk
+++ b/keyboards/input_club/infinity60/rules.mk
@@ -1,18 +1,3 @@
-# MCU name
-MCU = MK20DX128
-
-# Bootloader selection
-BOOTLOADER = kiibohd
-
-# Board: it should exist either in <chibios>/os/hal/boards/
-#  or <this_dir>/boards
-# - BOARD =
-#   - PJRC_TEENSY_LC for Teensy LC
-#   - PJRC_TEENSY_3 for Teensy 3.0
-#   - PJRC_TEENSY_3_1 for Teensy 3.1 or 3.2
-#   - MCHCK_K20 for Infinity KB
-BOARD = MCHCK_K20
-
 # Build Options
 #   change yes to no to disable
 #
diff --git a/keyboards/input_club/k_type/info.json b/keyboards/input_club/k_type/info.json
index 8bd8a4414c..60522333d7 100644
--- a/keyboards/input_club/k_type/info.json
+++ b/keyboards/input_club/k_type/info.json
@@ -8,6 +8,9 @@
         "pid": "0xB04D",
         "device_version": "0.0.1"
     },
+    "processor": "MK20DX256",
+    "bootloader": "kiibohd",
+    "board": "IC_TEENSY_3_1",
     "community_layouts": ["tkl_ansi"],
     "layouts": {
         "LAYOUT_tkl_ansi": {
diff --git a/keyboards/input_club/k_type/rules.mk b/keyboards/input_club/k_type/rules.mk
index 3ca2e0ee2b..3e5006cd5a 100644
--- a/keyboards/input_club/k_type/rules.mk
+++ b/keyboards/input_club/k_type/rules.mk
@@ -1,16 +1,3 @@
-# MCU name
-MCU = MK20DX256
-
-# Bootloader selection
-BOOTLOADER = kiibohd
-
-# 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, and an
-# override to disable restart of USB driver after returning from suspend.
-BOARD = IC_TEENSY_3_1
-
 # Build Options
 #   change yes to no to disable
 #
diff --git a/keyboards/input_club/whitefox/info.json b/keyboards/input_club/whitefox/info.json
index 9f65d1d8c2..0cd34f8312 100644
--- a/keyboards/input_club/whitefox/info.json
+++ b/keyboards/input_club/whitefox/info.json
@@ -7,6 +7,9 @@
         "pid": "0xB04D",
         "device_version": "0.0.1"
     },
+    "processor": "MK20DX256",
+    "bootloader": "kiibohd",
+    "board": "IC_TEENSY_3_1",
     "community_layouts": ["65_ansi", "65_ansi_blocker", "65_ansi_blocker_split_bs", "65_iso", "65_iso_blocker", "65_iso_blocker_split_bs"],
     "layouts": {
         "LAYOUT_all": {
diff --git a/keyboards/input_club/whitefox/rules.mk b/keyboards/input_club/whitefox/rules.mk
index 48691029aa..2a45fc02dd 100644
--- a/keyboards/input_club/whitefox/rules.mk
+++ b/keyboards/input_club/whitefox/rules.mk
@@ -1,16 +1,3 @@
-# MCU name
-MCU = MK20DX256
-
-# Bootloader selection
-BOOTLOADER = kiibohd
-
-# 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, and an
-# override to disable restart of USB driver after returning from suspend.
-BOARD = IC_TEENSY_3_1
-
 # Build Options
 #   change yes to no to disable
 #