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

2023-02-08 18:41:46 +11:00
parent 3499677b6a
commit f9aeea64c1
4886 changed files with 5301 additions and 14866 deletions
--- a/keyboards/xelus/akis/info.json
+++ b/keyboards/xelus/akis/info.json
@@ -8,6 +8,8 @@
        "pid": "0xA04B",
        "device_version": "0.0.1"
    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
    "layout_aliases": {
        "LAYOUT_65_all": "LAYOUT_all"
    },
--- a/keyboards/xelus/akis/rules.mk
+++ b/keyboards/xelus/akis/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = atmel-dfu
-
 # Build Options
 #   change yes to no to disable
 #
--- a/keyboards/xelus/dawn60/info.json
+++ b/keyboards/xelus/dawn60/info.json
@@ -8,6 +8,8 @@
        "pid": "0x0060",
        "device_version": "0.0.1"
    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
    "layout_aliases": {
        "LAYOUT_60_all": "LAYOUT_all"
    },
--- a/keyboards/xelus/dawn60/rev1/rules.mk
+++ b/keyboards/xelus/dawn60/rev1/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = atmel-dfu
-
 # Do not put the microcontroller into power saving mode
 # when we get USB suspend event. We want it to keep updating
 # backlight effects.
--- a/keyboards/xelus/dawn60/rev1_qmk/rules.mk
+++ b/keyboards/xelus/dawn60/rev1_qmk/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = atmel-dfu
-
 # Do not put the microcontroller into power saving mode
 # when we get USB suspend event. We want it to keep updating
 # backlight effects.
--- a/keyboards/xelus/dharma/info.json
+++ b/keyboards/xelus/dharma/info.json
@@ -8,6 +8,8 @@
        "pid": "0xDAAA",
        "device_version": "0.0.1"
    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
    "layouts": {
        "LAYOUT_all": {
            "layout": [
--- a/keyboards/xelus/dharma/rules.mk
+++ b/keyboards/xelus/dharma/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = atmel-dfu
-
 # Build Options
 #   change yes to no to disable
 #
--- a/keyboards/xelus/kangaroo/rev1/info.json
+++ b/keyboards/xelus/kangaroo/rev1/info.json
@@ -2,5 +2,7 @@
    "keyboard_name": "Kangaroo Rev 1.0",
    "usb": {
        "device_version": "0.0.1"
-    }
+    },
+    "processor": "STM32F072",
+    "bootloader": "stm32-dfu"
 }
--- a/keyboards/xelus/kangaroo/rev1/rules.mk
+++ b/keyboards/xelus/kangaroo/rev1/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = STM32F072
-
-# Bootloader selection
-BOOTLOADER = stm32-dfu
-
 # Build Options
 #   change yes to no to disable
 #
--- a/keyboards/xelus/kangaroo/rev2/info.json
+++ b/keyboards/xelus/kangaroo/rev2/info.json
@@ -2,5 +2,7 @@
    "keyboard_name": "Kangaroo Rev 2.0",
    "usb": {
        "device_version": "0.0.2"
-    }
+    },
+    "processor": "STM32L412",
+    "bootloader": "stm32-dfu"
 }
--- a/keyboards/xelus/kangaroo/rev2/rules.mk
+++ b/keyboards/xelus/kangaroo/rev2/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = STM32L412
-
-# Bootloader selection
-BOOTLOADER = stm32-dfu
-
 # Build Options
 #   change yes to no to disable
 #
--- a/keyboards/xelus/la_plus/info.json
+++ b/keyboards/xelus/la_plus/info.json
@@ -8,6 +8,8 @@
        "pid": "0x4C50",
        "device_version": "0.0.1"
    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
    "layouts": {
        "LAYOUT_all": {
            "layout": [
--- a/keyboards/xelus/la_plus/rules.mk
+++ b/keyboards/xelus/la_plus/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = atmel-dfu
-
 # Build Options
 #   change yes to no to disable
 #
--- a/keyboards/xelus/ninjin/info.json
+++ b/keyboards/xelus/ninjin/info.json
@@ -8,6 +8,8 @@
        "pid": "0x4E4A",
        "device_version": "0.0.1"
    },
+    "processor": "STM32F072",
+    "bootloader": "stm32-dfu",
    "layout_aliases": {
        "LAYOUT_all": "LAYOUT_tkl_ansi_tsangan"
    },
--- a/keyboards/xelus/ninjin/rules.mk
+++ b/keyboards/xelus/ninjin/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = STM32F072
-
-# Bootloader selection
-BOOTLOADER = stm32-dfu
-
 # Build Options
 #   change yes to no to disable
 #
--- a/keyboards/xelus/pachi/mini_32u4/info.json
+++ b/keyboards/xelus/pachi/mini_32u4/info.json
@@ -8,6 +8,8 @@
        "pid": "0x5041",
        "device_version": "0.0.1"
    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
    "layouts": {
        "LAYOUT_all": {
            "layout": [
--- a/keyboards/xelus/pachi/mini_32u4/rules.mk
+++ b/keyboards/xelus/pachi/mini_32u4/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = atmel-dfu
-
 # Build Options
 #   change yes to no to disable
 #
--- a/keyboards/xelus/pachi/rev1/info.json
+++ b/keyboards/xelus/pachi/rev1/info.json
@@ -8,6 +8,8 @@
        "pid": "0x5041",
        "device_version": "0.0.1"
    },
+    "processor": "STM32F072",
+    "bootloader": "stm32-dfu",
    "layouts": {
        "LAYOUT_all": {
            "layout": [
--- a/keyboards/xelus/pachi/rev1/rules.mk
+++ b/keyboards/xelus/pachi/rev1/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = STM32F072
-
-# Bootloader selection
-BOOTLOADER = stm32-dfu
-
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE

--- a/keyboards/xelus/pachi/rgb/rev1/info.json
+++ b/keyboards/xelus/pachi/rgb/rev1/info.json
@@ -8,6 +8,8 @@
        "pid": "0x5052",
        "device_version": "0.0.1"
    },
+    "processor": "STM32L422",
+    "bootloader": "stm32-dfu",
    "layout_aliases": {
        "LAYOUT_ansi_tsangan": "LAYOUT_tkl_ansi_tsangan"
    },
--- a/keyboards/xelus/pachi/rgb/rev1/rules.mk
+++ b/keyboards/xelus/pachi/rgb/rev1/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = STM32L422
-
-# Bootloader selection
-BOOTLOADER = stm32-dfu
-
 # Build Options
 #   change yes to no to disable
 #
--- a/keyboards/xelus/pachi/rgb/rev2/info.json
+++ b/keyboards/xelus/pachi/rgb/rev2/info.json
@@ -8,6 +8,8 @@
        "pid": "0x5053",
        "device_version": "0.0.2"
    },
+    "processor": "STM32L422",
+    "bootloader": "stm32-dfu",
    "layout_aliases": {
        "LAYOUT_ansi_tsangan": "LAYOUT_tkl_ansi_tsangan"
    },
--- a/keyboards/xelus/pachi/rgb/rev2/rules.mk
+++ b/keyboards/xelus/pachi/rgb/rev2/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = STM32L422
-
-# Bootloader selection
-BOOTLOADER = stm32-dfu
-
 # Build Options
 #   change yes to no to disable
 #
--- a/keyboards/xelus/rs108/info.json
+++ b/keyboards/xelus/rs108/info.json
@@ -8,6 +8,8 @@
        "pid": "0x5208",
        "device_version": "0.0.2"
    },
+    "processor": "STM32F401",
+    "bootloader": "stm32-dfu",
    "layouts": {
        "LAYOUT_108_fullsize_ansi": {
            "layout": [
--- a/keyboards/xelus/rs108/rules.mk
+++ b/keyboards/xelus/rs108/rules.mk
@@ -1,10 +1,3 @@
-# MCU name
-MCU = STM32F401
-BOARD = GENERIC_STM32_F401XC
-
-# Bootloader selection
-BOOTLOADER = stm32-dfu
-
 # Build Options
 #   change yes to no to disable
 #
--- a/keyboards/xelus/rs60/rev1/info.json
+++ b/keyboards/xelus/rs60/rev1/info.json
@@ -1,5 +1,7 @@
 {
    "usb": {
        "device_version": "0.1.0"
-    }
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu"
 }
--- a/keyboards/xelus/rs60/rev1/rules.mk
+++ b/keyboards/xelus/rs60/rev1/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = atmel-dfu
-
 # Build Options
 #   change yes to no to disable
 #
--- a/keyboards/xelus/rs60/rev2_0/info.json
+++ b/keyboards/xelus/rs60/rev2_0/info.json
@@ -1,5 +1,7 @@
 {
    "usb": {
        "device_version": "0.2.0"
-    }
+    },
+    "processor": "STM32F401",
+    "bootloader": "stm32-dfu"
 }
--- a/keyboards/xelus/rs60/rev2_0/rules.mk
+++ b/keyboards/xelus/rs60/rev2_0/rules.mk
@@ -1,10 +1,3 @@
-# MCU name
-MCU = STM32F401
-BOARD = GENERIC_STM32_F401XC
-
-# Bootloader selection
-BOOTLOADER = stm32-dfu
-
 # Build Options
 #   change yes to no to disable
 #
--- a/keyboards/xelus/rs60/rev2_1/info.json
+++ b/keyboards/xelus/rs60/rev2_1/info.json
@@ -1,5 +1,7 @@
 {
    "usb": {
        "device_version": "0.2.1"
-    }
+    },
+    "processor": "STM32L412",
+    "bootloader": "stm32-dfu"
 }
--- a/keyboards/xelus/rs60/rev2_1/rules.mk
+++ b/keyboards/xelus/rs60/rev2_1/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = STM32L412
-
-# Bootloader selection
-BOOTLOADER = stm32-dfu
-
 # Build Options
 #   change yes to no to disable
 #
--- a/keyboards/xelus/snap96/info.json
+++ b/keyboards/xelus/snap96/info.json
@@ -8,6 +8,8 @@
        "pid": "0x5396",
        "device_version": "0.0.1"
    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
    "layouts": {
        "LAYOUT_all": {
            "layout": [
--- a/keyboards/xelus/snap96/rules.mk
+++ b/keyboards/xelus/snap96/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = atmel-dfu
-
 # Build Options
 #   change yes to no to disable
 #
--- a/keyboards/xelus/trinityxttkl/info.json
+++ b/keyboards/xelus/trinityxttkl/info.json
@@ -8,6 +8,8 @@
        "pid": "0x5854",
        "device_version": "0.0.1"
    },
+    "processor": "STM32F072",
+    "bootloader": "stm32-dfu",
    "layouts": {
        "LAYOUT_all": {
            "layout": [
--- a/keyboards/xelus/trinityxttkl/rules.mk
+++ b/keyboards/xelus/trinityxttkl/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = STM32F072
-
-# Bootloader selection
-BOOTLOADER = stm32-dfu
-
 # Wildcard to allow APM32 MCU
 DFU_SUFFIX_ARGS = -v FFFF -p FFFF

--- a/keyboards/xelus/valor/rev1/info.json
+++ b/keyboards/xelus/valor/rev1/info.json
@@ -8,6 +8,8 @@
        "pid": "0x5652",
        "device_version": "0.0.1"
    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
    "community_layouts": ["alice_split_bs"],
    "layouts": {
        "LAYOUT_alice_split_bs": {
--- a/keyboards/xelus/valor/rev1/rules.mk
+++ b/keyboards/xelus/valor/rev1/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = atmel-dfu
-
 # Build Options
 #   change yes to no to disable
 #
--- a/keyboards/xelus/valor/rev2/info.json
+++ b/keyboards/xelus/valor/rev2/info.json
@@ -8,6 +8,8 @@
        "pid": "0x5653",
        "device_version": "0.0.1"
    },
+    "processor": "STM32L422",
+    "bootloader": "stm32-dfu",
    "community_layouts": ["alice_split_bs"],
    "layouts": {
        "LAYOUT_alice_split_bs": {
--- a/keyboards/xelus/valor/rev2/rules.mk
+++ b/keyboards/xelus/valor/rev2/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = STM32L422
-
-# Bootloader selection
-BOOTLOADER = stm32-dfu
-
 # Build Options
 #   change yes to no to disable
 #
--- a/keyboards/xelus/valor_frl_tkl/rev1/info.json
+++ b/keyboards/xelus/valor_frl_tkl/rev1/info.json
@@ -2,5 +2,7 @@
    "keyboard_name": "Valor FRL TKL Rev1",
    "usb": {
        "device_version": "0.0.1"
-    }
+    },
+    "processor": "STM32F072",
+    "bootloader": "stm32-dfu"
 }
--- a/keyboards/xelus/valor_frl_tkl/rev1/rules.mk
+++ b/keyboards/xelus/valor_frl_tkl/rev1/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = STM32F072
-
-# Bootloader selection
-BOOTLOADER = stm32-dfu
-
 # Build Options
 #   change yes to no to disable
 #
--- a/keyboards/xelus/valor_frl_tkl/rev2_0/info.json
+++ b/keyboards/xelus/valor_frl_tkl/rev2_0/info.json
@@ -2,5 +2,7 @@
    "keyboard_name": "Valor FRL TKL Rev2.0",
    "usb": {
        "device_version": "0.0.2"
-    }
+    },
+    "processor": "STM32F411",
+    "bootloader": "stm32-dfu"
 }
--- a/keyboards/xelus/valor_frl_tkl/rev2_0/rules.mk
+++ b/keyboards/xelus/valor_frl_tkl/rev2_0/rules.mk
@@ -1,10 +1,3 @@
-# MCU name
-MCU = STM32F411
-BOARD = GENERIC_STM32_F411XE
-
-# Bootloader selection
-BOOTLOADER = stm32-dfu
-
 # Build Options
 #   change yes to no to disable
 #
--- a/keyboards/xelus/valor_frl_tkl/rev2_1/info.json
+++ b/keyboards/xelus/valor_frl_tkl/rev2_1/info.json
@@ -2,5 +2,7 @@
    "keyboard_name": "Valor FRL TKL Rev2.2",
    "usb": {
        "device_version": "0.0.3"
-    }
+    },
+    "processor": "STM32F401",
+    "bootloader": "stm32-dfu"
 }
--- a/keyboards/xelus/valor_frl_tkl/rev2_1/rules.mk
+++ b/keyboards/xelus/valor_frl_tkl/rev2_1/rules.mk
@@ -1,10 +1,3 @@
-# MCU name
-MCU = STM32F401
-BOARD = GENERIC_STM32_F401XC
-
-# Bootloader selection
-BOOTLOADER = stm32-dfu
-
 # Build Options
 #   change yes to no to disable
 #
--- a/keyboards/xelus/xs108/info.json
+++ b/keyboards/xelus/xs108/info.json
@@ -8,6 +8,8 @@
        "pid": "0x0108",
        "device_version": "0.0.1"
    },
+    "processor": "STM32L412",
+    "bootloader": "stm32-dfu",
    "layouts": {
        "LAYOUT_108_ansi": {
            "layout": [
--- a/keyboards/xelus/xs108/rules.mk
+++ b/keyboards/xelus/xs108/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = STM32L412
-
-# Bootloader selection
-BOOTLOADER = stm32-dfu
-
 # Build Options
 #   change yes to no to disable
 #
--- a/keyboards/xelus/xs60/hotswap/info.json
+++ b/keyboards/xelus/xs60/hotswap/info.json
@@ -8,6 +8,8 @@
        "pid": "0x5861",
        "device_version": "0.0.1"
    },
+    "processor": "STM32L422",
+    "bootloader": "stm32-dfu",
    "diode_direction": "COL2ROW",
    "matrix_pins": {
        "cols": ["B0", "B1", "A8", "A9", "B5", "A6", "C14", "C15", "A0", "A5","A4","A3","A2","A1"],
--- a/keyboards/xelus/xs60/hotswap/rules.mk
+++ b/keyboards/xelus/xs60/hotswap/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = STM32L422
-
-# Bootloader selection
-BOOTLOADER = stm32-dfu
-
 # Build Options
 #   change yes to no to disable
 #
--- a/keyboards/xelus/xs60/soldered/info.json
+++ b/keyboards/xelus/xs60/soldered/info.json
@@ -8,6 +8,8 @@
        "pid": "0x5860",
        "device_version": "0.0.1"
    },
+    "processor": "STM32L422",
+    "bootloader": "stm32-dfu",
    "diode_direction": "COL2ROW",
    "matrix_pins": {
        "cols": ["B0", "B1", "A8", "A9", "B5", "A6", "C14", "C15", "A0", "A5", "A4", "A3", "A2", "A1"],
--- a/keyboards/xelus/xs60/soldered/rules.mk
+++ b/keyboards/xelus/xs60/soldered/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = STM32L422
-
-# Bootloader selection
-BOOTLOADER = stm32-dfu
-
 # Build Options
 #   change yes to no to disable
 #