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/kin80/blackpill103/info.json | 4 +++-
 keyboards/kin80/blackpill103/rules.mk  | 6 ------
 keyboards/kin80/blackpill401/info.json | 5 ++++-
 keyboards/kin80/blackpill401/rules.mk  | 7 -------
 keyboards/kin80/blackpill411/info.json | 5 ++++-
 keyboards/kin80/blackpill411/rules.mk  | 7 -------
 keyboards/kin80/micro/info.json        | 4 +++-
 keyboards/kin80/micro/rules.mk         | 5 -----
 8 files changed, 14 insertions(+), 29 deletions(-)

(limited to 'keyboards/kin80')

diff --git a/keyboards/kin80/blackpill103/info.json b/keyboards/kin80/blackpill103/info.json
index e557e4d307..63c9650579 100644
--- a/keyboards/kin80/blackpill103/info.json
+++ b/keyboards/kin80/blackpill103/info.json
@@ -1,5 +1,7 @@
 {
     "usb": {
         "device_version": "0.0.2"
-    }
+    },
+    "processor": "STM32F103",
+    "bootloader": "stm32duino"
 }
diff --git a/keyboards/kin80/blackpill103/rules.mk b/keyboards/kin80/blackpill103/rules.mk
index 019b1130d9..a92b099328 100644
--- a/keyboards/kin80/blackpill103/rules.mk
+++ b/keyboards/kin80/blackpill103/rules.mk
@@ -1,8 +1,2 @@
-# MCU name
-MCU = STM32F103
-
-# Bootloader selection
-BOOTLOADER = stm32duino
-
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/kin80/blackpill401/info.json b/keyboards/kin80/blackpill401/info.json
index b377cdff00..7d4ec1294e 100644
--- a/keyboards/kin80/blackpill401/info.json
+++ b/keyboards/kin80/blackpill401/info.json
@@ -1,5 +1,8 @@
 {
     "usb": {
         "device_version": "0.0.3"
-    }
+    },
+    "processor": "STM32F401",
+    "bootloader": "stm32-dfu",
+    "board": "BLACKPILL_STM32_F401"
 }
diff --git a/keyboards/kin80/blackpill401/rules.mk b/keyboards/kin80/blackpill401/rules.mk
index 1fec226e9b..1071cf62ee 100644
--- a/keyboards/kin80/blackpill401/rules.mk
+++ b/keyboards/kin80/blackpill401/rules.mk
@@ -1,8 +1 @@
-# MCU name
-MCU = STM32F401
-BOARD = BLACKPILL_STM32_F401
-
-# Bootloader selection
-BOOTLOADER = stm32-dfu
-
 KEYBOARD_SHARED_EP = yes
diff --git a/keyboards/kin80/blackpill411/info.json b/keyboards/kin80/blackpill411/info.json
index b377cdff00..6ad9e67e04 100644
--- a/keyboards/kin80/blackpill411/info.json
+++ b/keyboards/kin80/blackpill411/info.json
@@ -1,5 +1,8 @@
 {
     "usb": {
         "device_version": "0.0.3"
-    }
+    },
+    "processor": "STM32F411",
+    "bootloader": "stm32-dfu",
+    "board": "BLACKPILL_STM32_F411"
 }
diff --git a/keyboards/kin80/blackpill411/rules.mk b/keyboards/kin80/blackpill411/rules.mk
index cd1657335d..1071cf62ee 100644
--- a/keyboards/kin80/blackpill411/rules.mk
+++ b/keyboards/kin80/blackpill411/rules.mk
@@ -1,8 +1 @@
-# MCU name
-MCU = STM32F411
-BOARD = BLACKPILL_STM32_F411
-
-# Bootloader selection
-BOOTLOADER = stm32-dfu
-
 KEYBOARD_SHARED_EP = yes
diff --git a/keyboards/kin80/micro/info.json b/keyboards/kin80/micro/info.json
index 90ac25f360..7818e74537 100644
--- a/keyboards/kin80/micro/info.json
+++ b/keyboards/kin80/micro/info.json
@@ -1,5 +1,7 @@
 {
     "usb": {
         "device_version": "0.0.1"
-    }
+    },
+    "processor": "atmega32u4",
+    "bootloader": "lufa-dfu"
 }
diff --git a/keyboards/kin80/micro/rules.mk b/keyboards/kin80/micro/rules.mk
index def852a531..e69de29bb2 100644
--- a/keyboards/kin80/micro/rules.mk
+++ b/keyboards/kin80/micro/rules.mk
@@ -1,5 +0,0 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = lufa-dfu
\ No newline at end of file
-- 
cgit v1.2.3