From f9aeea64c1f85d388485503e52035b5f7533ed26 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Wed, 8 Feb 2023 18:41:46 +1100
Subject: Migrate `MCU` and `BOOTLOADER` to data-driven (#19529)

---
 keyboards/kinesis/alvicstep/info.json     | 4 +++-
 keyboards/kinesis/kint2pp/info.json       | 2 ++
 keyboards/kinesis/kint36/info.json        | 2 ++
 keyboards/kinesis/kint36/rules.mk         | 3 ---
 keyboards/kinesis/kint41/rules.mk         | 5 +++--
 keyboards/kinesis/kintlc/info.json        | 2 ++
 keyboards/kinesis/kintlc/rules.mk         | 2 --
 keyboards/kinesis/nguyenvietyen/info.json | 4 +++-
 keyboards/kinesis/nguyenvietyen/rules.mk  | 6 ------
 keyboards/kinesis/rules.mk                | 6 ------
 keyboards/kinesis/stapelberg/info.json    | 4 +++-
 11 files changed, 18 insertions(+), 22 deletions(-)

(limited to 'keyboards/kinesis')

diff --git a/keyboards/kinesis/alvicstep/info.json b/keyboards/kinesis/alvicstep/info.json
index 1db31a0429..009bfb8393 100644
--- a/keyboards/kinesis/alvicstep/info.json
+++ b/keyboards/kinesis/alvicstep/info.json
@@ -5,5 +5,7 @@
         "vid": "0xFEED",
         "pid": "0x6060",
         "device_version": "0.0.1"
-    }
+    },
+    "processor": "at90usb1286",
+    "bootloader": "halfkay"
 }
diff --git a/keyboards/kinesis/kint2pp/info.json b/keyboards/kinesis/kint2pp/info.json
index dcc543e0fc..e31d3490a0 100644
--- a/keyboards/kinesis/kint2pp/info.json
+++ b/keyboards/kinesis/kint2pp/info.json
@@ -6,5 +6,7 @@
         "pid": "0x6060",
         "device_version": "0.0.2"
     },
+    "processor": "at90usb1286",
+    "bootloader": "halfkay",
     "debounce": 20
 }
diff --git a/keyboards/kinesis/kint36/info.json b/keyboards/kinesis/kint36/info.json
index 61bd4508a0..fca353504f 100644
--- a/keyboards/kinesis/kint36/info.json
+++ b/keyboards/kinesis/kint36/info.json
@@ -6,5 +6,7 @@
         "pid": "0x345C",
         "device_version": "0.0.1"
     },
+    "processor": "MK66FX1M0",
+    "bootloader": "halfkay",
     "debounce": 20
 }
diff --git a/keyboards/kinesis/kint36/rules.mk b/keyboards/kinesis/kint36/rules.mk
index d495568dd3..7c48a98bfc 100644
--- a/keyboards/kinesis/kint36/rules.mk
+++ b/keyboards/kinesis/kint36/rules.mk
@@ -1,6 +1,3 @@
-# MCU name
-MCU = MK66FX1M0
-
 # Debounce eagerly (report change immediately), keep per-key timers. We can use
 # this because the kinT does not have to deal with noise.
 DEBOUNCE_TYPE = sym_eager_pk
diff --git a/keyboards/kinesis/kint41/rules.mk b/keyboards/kinesis/kint41/rules.mk
index 4b39b87be6..99c7c0f7d6 100644
--- a/keyboards/kinesis/kint41/rules.mk
+++ b/keyboards/kinesis/kint41/rules.mk
@@ -6,9 +6,10 @@ BOARD = IC_TEENSY_4_1
 MCU = cortex-m4
 ARMV = 7
 
+# Bootloader selection
+BOOTLOADER = halfkay
+
 # Debounce eagerly (report change immediately), keep per-key timers. We can use
 # this because the Cherry MX keyswitches on the Kinesis only produce noise while
 # pressed.
 DEBOUNCE_TYPE = sym_eager_pk
-
-FIRMWARE_FORMAT = hex
diff --git a/keyboards/kinesis/kintlc/info.json b/keyboards/kinesis/kintlc/info.json
index d937ad902d..d05b01ec09 100644
--- a/keyboards/kinesis/kintlc/info.json
+++ b/keyboards/kinesis/kintlc/info.json
@@ -6,5 +6,7 @@
         "pid": "0x345C",
         "device_version": "0.0.1"
     },
+    "processor": "MKL26Z64",
+    "bootloader": "halfkay",
     "debounce": 20
 }
diff --git a/keyboards/kinesis/kintlc/rules.mk b/keyboards/kinesis/kintlc/rules.mk
index bfc10748ab..a6a1eafbfc 100644
--- a/keyboards/kinesis/kintlc/rules.mk
+++ b/keyboards/kinesis/kintlc/rules.mk
@@ -1,5 +1,3 @@
-# MCU name
-MCU = MKL26Z64
 # This MCU is not in the main CHIBIOS repo but in the CHIBIOS_CONTRIB repo.
 USE_CHIBIOS_CONTRIB = yes
 
diff --git a/keyboards/kinesis/nguyenvietyen/info.json b/keyboards/kinesis/nguyenvietyen/info.json
index 4035bb8e11..7a48682684 100644
--- a/keyboards/kinesis/nguyenvietyen/info.json
+++ b/keyboards/kinesis/nguyenvietyen/info.json
@@ -5,5 +5,7 @@
         "vid": "0xFEED",
         "pid": "0x6060",
         "device_version": "0.0.3"
-    }
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina"
 }
diff --git a/keyboards/kinesis/nguyenvietyen/rules.mk b/keyboards/kinesis/nguyenvietyen/rules.mk
index 65018bc3cc..3e0a265135 100644
--- a/keyboards/kinesis/nguyenvietyen/rules.mk
+++ b/keyboards/kinesis/nguyenvietyen/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/kinesis/rules.mk b/keyboards/kinesis/rules.mk
index 129e08635d..2090c50d47 100644
--- a/keyboards/kinesis/rules.mk
+++ b/keyboards/kinesis/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = at90usb1286
-
-# Bootloader selection
-BOOTLOADER = halfkay
-
 # Build Options
 #   change yes to no to disable
 #
diff --git a/keyboards/kinesis/stapelberg/info.json b/keyboards/kinesis/stapelberg/info.json
index b44abddfdf..ba14567443 100644
--- a/keyboards/kinesis/stapelberg/info.json
+++ b/keyboards/kinesis/stapelberg/info.json
@@ -5,5 +5,7 @@
         "vid": "0xFEED",
         "pid": "0x6060",
         "device_version": "0.0.2"
-    }
+    },
+    "processor": "at90usb1286",
+    "bootloader": "halfkay"
 }
-- 
cgit v1.2.3