Clean up remaining rules.mk MCU/BOOTLOADERs (#19778)

Co-authored-by: Nick Brassel <nick@tzarc.org>
2023-02-17 14:15:06 +11:00
parent f4ba17c4a0
commit 43843e19b6
31 changed files with 50 additions and 79 deletions
--- a/keyboards/mechlovin/adelais/standard_led/arm/rev2/info.json
+++ b/keyboards/mechlovin/adelais/standard_led/arm/rev2/info.json
@@ -1,5 +1,8 @@
 {
    "usb": {
        "pid": "0xAD01"
-    }
+    },
+    "processor": "STM32F303",
+    "board": "QMK_PROTON_C",
+    "bootloader": "stm32-dfu"
 }
--- a/keyboards/mechlovin/adelais/standard_led/arm/rev3/info.json
+++ b/keyboards/mechlovin/adelais/standard_led/arm/rev3/info.json
@@ -1,5 +1,8 @@
 {
    "usb": {
        "pid": "0xAD02"
-    }
+    },
+    "processor": "STM32F303",
+    "board": "QMK_PROTON_C",
+    "bootloader": "stm32-dfu"
 }
--- a/keyboards/mechlovin/adelais/standard_led/arm/rev4/apm32f103/info.json
+++ b/keyboards/mechlovin/adelais/standard_led/arm/rev4/apm32f103/info.json
@@ -0,0 +1,4 @@
+{
+    "processor": "STM32F103",
+    "bootloader": "stm32duino"
+}
--- a/keyboards/mechlovin/adelais/standard_led/arm/rev4/apm32f103/rules.mk
+++ b/keyboards/mechlovin/adelais/standard_led/arm/rev4/apm32f103/rules.mk
@@ -1,5 +0,0 @@
-# MCU name
-MCU = STM32F103
-
-# Bootloader selection
-BOOTLOADER = stm32duino
--- a/keyboards/mechlovin/adelais/standard_led/arm/rev4/rules.mk
+++ b/keyboards/mechlovin/adelais/standard_led/arm/rev4/rules.mk
@@ -1 +1,3 @@
 ENCODER_ENABLE = yes
+
+DEFAULT_FOLDER = mechlovin/adelais/standard_led/arm/rev4/stm32f303
--- a/keyboards/mechlovin/adelais/standard_led/arm/rev4/stm32f303/info.json
+++ b/keyboards/mechlovin/adelais/standard_led/arm/rev4/stm32f303/info.json
@@ -0,0 +1,5 @@
+{
+    "processor": "STM32F303",
+    "board": "QMK_PROTON_C",
+    "bootloader": "stm32-dfu"
+}
--- a/keyboards/mechlovin/adelais/standard_led/arm/rev4/stm32f303/rules.mk
+++ b/keyboards/mechlovin/adelais/standard_led/arm/rev4/stm32f303/rules.mk
@@ -1,6 +0,0 @@
-# MCU name
-MCU = STM32F303
-BOARD = QMK_PROTON_C
-
-# Bootloader selection
-BOOTLOADER = stm32-dfu