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

12 files changed, 14 insertions, 27 deletions

diff --git a/keyboards/marksard/leftover30/info.json b/keyboards/marksard/leftover30/info.json
index 61f2a92251..7c4a6b4345 100644
--- a/keyboards/marksard/leftover30/info.json
+++ b/keyboards/marksard/leftover30/info.json
@@ -8,6 +8,8 @@
         "pid": "0xDFA8",
         "device_version": "0.0.1"
     },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
     "layouts": {
         "LAYOUT_all": {
             "layout": [
diff --git a/keyboards/marksard/leftover30/rules.mk b/keyboards/marksard/leftover30/rules.mk
index 1681487a94..9f1aa1c0bf 100644
--- a/keyboards/marksard/leftover30/rules.mk
+++ b/keyboards/marksard/leftover30/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = caterina
-
 # Build Options
 #   change yes to no to disable
 #
diff --git a/keyboards/marksard/rhymestone/rev1/info.json b/keyboards/marksard/rhymestone/rev1/info.json
index 5373c34a02..a8b3c790ed 100644
--- a/keyboards/marksard/rhymestone/rev1/info.json
+++ b/keyboards/marksard/rhymestone/rev1/info.json
@@ -8,6 +8,8 @@
         "pid": "0xDFA1",
         "device_version": "0.2.0"
     },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
     "community_layouts": ["ortho_4x10"],
     "layouts": {
         "LAYOUT_ortho_4x10": {
diff --git a/keyboards/marksard/rhymestone/rules.mk b/keyboards/marksard/rhymestone/rules.mk
index 6bdbdcba3d..affdbd6f11 100644
--- a/keyboards/marksard/rhymestone/rules.mk
+++ b/keyboards/marksard/rhymestone/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = caterina
-
 # Build Options
 #   change yes to no to disable
 #
diff --git a/keyboards/marksard/treadstone32/lite/info.json b/keyboards/marksard/treadstone32/lite/info.json
index 2d66455900..040083b968 100644
--- a/keyboards/marksard/treadstone32/lite/info.json
+++ b/keyboards/marksard/treadstone32/lite/info.json
@@ -2,5 +2,7 @@
     "keyboard_name": "treadstone32 lite",
     "usb": {
         "device_version": "0.1.5"
-    }
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina"
 }
diff --git a/keyboards/marksard/treadstone32/lite/rules.mk b/keyboards/marksard/treadstone32/lite/rules.mk
index 6ded83e74b..e69de29bb2 100644
--- a/keyboards/marksard/treadstone32/lite/rules.mk
+++ b/keyboards/marksard/treadstone32/lite/rules.mk
@@ -1,2 +0,0 @@
-# Bootloader selection
-BOOTLOADER = caterina
diff --git a/keyboards/marksard/treadstone32/rev1/info.json b/keyboards/marksard/treadstone32/rev1/info.json
index 9a2ae10a50..51b46b22d2 100644
--- a/keyboards/marksard/treadstone32/rev1/info.json
+++ b/keyboards/marksard/treadstone32/rev1/info.json
@@ -2,5 +2,7 @@
     "keyboard_name": "treadstone32",
     "usb": {
         "device_version": "0.1.0"
-    }
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu"
 }
diff --git a/keyboards/marksard/treadstone32/rev1/rules.mk b/keyboards/marksard/treadstone32/rev1/rules.mk
index bddd4e389e..e69de29bb2 100644
--- a/keyboards/marksard/treadstone32/rev1/rules.mk
+++ b/keyboards/marksard/treadstone32/rev1/rules.mk
@@ -1,2 +0,0 @@
-# Bootloader selection
-BOOTLOADER = atmel-dfu
diff --git a/keyboards/marksard/treadstone32/rules.mk b/keyboards/marksard/treadstone32/rules.mk
index a0b43873cc..43e13475d3 100644
--- a/keyboards/marksard/treadstone32/rules.mk
+++ b/keyboards/marksard/treadstone32/rules.mk
@@ -1,6 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
 # Build Options
 #   change yes to no to disable
 #
diff --git a/keyboards/marksard/treadstone48/rev1/info.json b/keyboards/marksard/treadstone48/rev1/info.json
index 9182a3e9cf..a17d9ab0a2 100644
--- a/keyboards/marksard/treadstone48/rev1/info.json
+++ b/keyboards/marksard/treadstone48/rev1/info.json
@@ -8,6 +8,8 @@
     "pid": "0xDFA3",
     "device_version": "0.1.0"
   },
+  "processor": "atmega32u4",
+  "bootloader": "caterina",
   "layouts": {
     "LAYOUT_base": {
       "layout": [
diff --git a/keyboards/marksard/treadstone48/rev2/info.json b/keyboards/marksard/treadstone48/rev2/info.json
index 37c513e24e..34f44f1aba 100644
--- a/keyboards/marksard/treadstone48/rev2/info.json
+++ b/keyboards/marksard/treadstone48/rev2/info.json
@@ -8,6 +8,8 @@
         "pid": "0xDFA3",
         "device_version": "0.2.0"
     },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
     "layouts": {
         "LAYOUT_base": {
             "layout": [
diff --git a/keyboards/marksard/treadstone48/rules.mk b/keyboards/marksard/treadstone48/rules.mk
index 67c171a7b7..78219bface 100644
--- a/keyboards/marksard/treadstone48/rules.mk
+++ b/keyboards/marksard/treadstone48/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = caterina
-
 # Build Options
 #   change yes to no to disable
 #