Migrate `MCU` and `BOOTLOADER` to data-driven (#19529)

10 files changed, 16 insertions, 34 deletions

diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/info.json b/keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/info.json
index 63663f337d..322dd9f782 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/info.json
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/info.json
@@ -1,3 +1,5 @@
 {
-    "keyboard_name": "Tractyl Manuform(5x6) Arduino Micro (r)/ Pro Micro (l)"
+    "keyboard_name": "Tractyl Manuform(5x6) Arduino Micro (r)/ Pro Micro (l)",
+    "processor": "atmega32u4",
+    "bootloader": "caterina"
 }
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/rules.mk b/keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/rules.mk
index cf663a7ed6..e69de29bb2 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/rules.mk
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/rules.mk
@@ -1,5 +0,0 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = caterina
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/info.json b/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/info.json
index b3cb5928de..3bc4455c55 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/info.json
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/info.json
@@ -1,3 +1,5 @@
 {
-    "keyboard_name": "Tractyl Manuform (5x6) Elite-C"
+    "keyboard_name": "Tractyl Manuform (5x6) Elite-C",
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu"
 }
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/rules.mk b/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/rules.mk
index e594097f8b..16c76d7f49 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/rules.mk
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = atmel-dfu
-
 LTO_ENABLE := yes
 RGBLIGHT_ENABLE = no
 OLED_ENABLE = no
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f303/info.json b/keyboards/handwired/tractyl_manuform/5x6_right/f303/info.json
index d88708d17d..3ad29d36b8 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/f303/info.json
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/f303/info.json
@@ -1,3 +1,5 @@
 {
-    "keyboard_name": "Tractyl Manuform (5x6) Proton-C"
+    "keyboard_name": "Tractyl Manuform (5x6) Proton-C",
+    "processor": "STM32F303",
+    "bootloader": "stm32-dfu"
 }
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f303/rules.mk b/keyboards/handwired/tractyl_manuform/5x6_right/f303/rules.mk
index 622d22704d..7abe7f4ca2 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/f303/rules.mk
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/f303/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = STM32F303
-
-# Bootloader selection
-BOOTLOADER = stm32-dfu
-
 # KEYBOARD_SHARED_EP = yes
 CONSOLE_ENABLE     = yes
 
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/info.json b/keyboards/handwired/tractyl_manuform/5x6_right/f411/info.json
index 7466004165..9b81dc18eb 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/info.json
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/f411/info.json
@@ -1,3 +1,6 @@
 {
-    "keyboard_name": "Tractyl Manuform (5x6) BlackPill"
+    "keyboard_name": "Tractyl Manuform (5x6) BlackPill",
+    "processor": "STM32F411",
+    "bootloader": "stm32-dfu",
+    "board": "BLACKPILL_STM32_F411"
 }
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/rules.mk b/keyboards/handwired/tractyl_manuform/5x6_right/f411/rules.mk
index dcbcc7ee7e..4b8fe43b84 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/rules.mk
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/f411/rules.mk
@@ -1,10 +1,3 @@
-# MCU name
-MCU = STM32F411
-BOARD = BLACKPILL_STM32_F411
-
-# Bootloader selection
-BOOTLOADER = stm32-dfu
-
 KEYBOARD_SHARED_EP = yes
 CONSOLE_ENABLE     = yes
 MOUSE_SHARED_EP    = yes
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/info.json b/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/info.json
index dfdbc435bc..9dc037b2c4 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/info.json
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/info.json
@@ -1,3 +1,5 @@
 {
-    "keyboard_name": "Tractyl Manuform (5x6) Teensy 2.0++"
+    "keyboard_name": "Tractyl Manuform (5x6) Teensy 2.0++",
+    "processor": "at90usb1286",
+    "bootloader": "halfkay"
 }
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/rules.mk b/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/rules.mk
index 149471682d..e69de29bb2 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/rules.mk
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/rules.mk
@@ -1,5 +0,0 @@
-# MCU name
-MCU = at90usb1286
-
-# Bootloader selection
-BOOTLOADER = halfkay