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

6 files changed, 6 insertions, 18 deletions

diff --git a/keyboards/unikeyboard/diverge3/info.json b/keyboards/unikeyboard/diverge3/info.json
index 74dc2641a1..01c2922b25 100644
--- a/keyboards/unikeyboard/diverge3/info.json
+++ b/keyboards/unikeyboard/diverge3/info.json
@@ -8,6 +8,8 @@
     "pid": "0x1257",
     "device_version": "0.0.1"
   },
+  "processor": "atmega32u4",
+  "bootloader": "caterina",
   "layouts": {
     "LAYOUT": {
       "layout": [{"x":0, "y":0}, {"x":1, "y":0.75}, {"x":2, "y":0.25}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0.25}, {"x":6, "y":0.5}, {"x":10, "y":0.5}, {"x":11, "y":0.25}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0.25}, {"x":15, "y":0.75}, {"x":16, "y":0}, {"x":0, "y":1}, {"x":1, "y":1.75}, {"x":2, "y":1.25}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1.25}, {"x":6, "y":1.5}, {"x":10, "y":1.5}, {"x":11, "y":1.25}, {"x":12, "y":1}, {"x":13, "y":1}, {"x":14, "y":1.25}, {"x":15, "y":1.75}, {"x":16, "y":1}, {"x":0, "y":2}, {"x":1, "y":2.75}, {"x":2, "y":2.25}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2.25}, {"x":6, "y":2.5}, {"x":10, "y":2.5}, {"x":11, "y":2.25}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":14, "y":2.25}, {"x":15, "y":2.75}, {"x":16, "y":2}, {"x":0, "y":3}, {"x":1, "y":3.75}, {"x":2, "y":3.25}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3.25}, {"x":6, "y":3.5}, {"x":10, "y":3.5}, {"x":11, "y":3.25}, {"x":12, "y":3}, {"x":13, "y":3}, {"x":14, "y":3.25}, {"x":15, "y":3.75}, {"x":16, "y":3}, {"x":0, "y":4}, {"x":1, "y":4.75}, {"x":2, "y":4.25}, {"x":3, "y":4}, {"x":4, "y":4}, {"x":5, "y":4.75, "h":1.25}, {"x":6, "y":5, "h":1.25}, {"x":7, "y":5.25}, {"x":9, "y":5.25}, {"x":10, "y":5, "h":1.25}, {"x":11, "y":4.75, "h":1.25}, {"x":12, "y":4}, {"x":13, "y":4}, {"x":14, "y":4.25}, {"x":15, "y":4.75}, {"x":16, "y":4}]
diff --git a/keyboards/unikeyboard/diverge3/rules.mk b/keyboards/unikeyboard/diverge3/rules.mk
index 7fc9fd2291..4069544018 100644
--- a/keyboards/unikeyboard/diverge3/rules.mk
+++ b/keyboards/unikeyboard/diverge3/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/unikeyboard/divergetm2/info.json b/keyboards/unikeyboard/divergetm2/info.json
index 4d707c944c..f58dbecdce 100644
--- a/keyboards/unikeyboard/divergetm2/info.json
+++ b/keyboards/unikeyboard/divergetm2/info.json
@@ -8,6 +8,8 @@
         "pid": "0x1256",
         "device_version": "0.0.1"
     },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
     "layouts": {
         "LAYOUT": {
             "layout": [
diff --git a/keyboards/unikeyboard/divergetm2/rules.mk b/keyboards/unikeyboard/divergetm2/rules.mk
index bd53948797..7f1fc659cc 100644
--- a/keyboards/unikeyboard/divergetm2/rules.mk
+++ b/keyboards/unikeyboard/divergetm2/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/unikeyboard/felix/info.json b/keyboards/unikeyboard/felix/info.json
index 47ed824f62..f8ebb75424 100644
--- a/keyboards/unikeyboard/felix/info.json
+++ b/keyboards/unikeyboard/felix/info.json
@@ -8,6 +8,8 @@
     "pid": "0x6060",
     "device_version": "0.0.1"
   },
+  "processor": "atmega32u4",
+  "bootloader": "caterina",
   "community_layouts": ["ortho_5x4"],
   "layouts": {
     "LAYOUT_ortho_5x4": {
diff --git a/keyboards/unikeyboard/felix/rules.mk b/keyboards/unikeyboard/felix/rules.mk
index c2e40b55c5..b325f3f0c7 100644
--- a/keyboards/unikeyboard/felix/rules.mk
+++ b/keyboards/unikeyboard/felix/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = caterina
-
 # Build Options
 #   change yes to no to disable
 #