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/handwired/dactyl_manuform/3x5_3/info.json
+++ b/keyboards/handwired/dactyl_manuform/3x5_3/info.json
@@ -8,6 +8,8 @@
        "pid": "0x3536",
        "device_version": "0.0.3"
    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
    "community_layouts": ["split_3x5_3"],
    "layouts": {
        "LAYOUT_split_3x5_3": {
--- a/keyboards/handwired/dactyl_manuform/3x5_3/rules.mk
+++ b/keyboards/handwired/dactyl_manuform/3x5_3/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = caterina
-
 # Build Options
 #   change yes to no to disable
 #
--- a/keyboards/handwired/dactyl_manuform/4x5/info.json
+++ b/keyboards/handwired/dactyl_manuform/4x5/info.json
@@ -8,6 +8,8 @@
        "pid": "0x3435",
        "device_version": "0.0.1"
    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
    "layouts": {
        "LAYOUT": {
            "layout": [
--- a/keyboards/handwired/dactyl_manuform/4x5/rules.mk
+++ b/keyboards/handwired/dactyl_manuform/4x5/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = caterina
-
 # Build Options
 #   change yes to no to disable
 #
--- a/keyboards/handwired/dactyl_manuform/4x5_5/info.json
+++ b/keyboards/handwired/dactyl_manuform/4x5_5/info.json
@@ -8,6 +8,8 @@
        "pid": "0x3435",
        "device_version": "0.0.1"
    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
    "layouts": {
        "LAYOUT": {
            "layout": [
--- a/keyboards/handwired/dactyl_manuform/4x5_5/rules.mk
+++ b/keyboards/handwired/dactyl_manuform/4x5_5/rules.mk
@@ -1,12 +1,3 @@
-
-# MCU for Elite-C/Pro Micro
-MCU = atmega32u4
-
-# BOOTLOADER for Elite-C
-BOOTLOADER = atmel-dfu
-# BOOTLOADER for Pro Micro
-# BOOTLOADER = caterina
-
 # Build Options

 BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
--- a/keyboards/handwired/dactyl_manuform/4x6/info.json
+++ b/keyboards/handwired/dactyl_manuform/4x6/info.json
@@ -8,6 +8,8 @@
        "pid": "0x3436",
        "device_version": "0.0.1"
    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
    "layouts": {
        "LAYOUT": {
            "layout": [
--- a/keyboards/handwired/dactyl_manuform/4x6/rules.mk
+++ b/keyboards/handwired/dactyl_manuform/4x6/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = caterina
-
 # Build Options
 #   change yes to no to disable
 #
--- a/keyboards/handwired/dactyl_manuform/4x6_5/info.json
+++ b/keyboards/handwired/dactyl_manuform/4x6_5/info.json
@@ -8,6 +8,8 @@
        "pid": "0x3436",
        "device_version": "0.0.1"
    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
    "layouts": {
        "LAYOUT": {
            "layout": [
--- a/keyboards/handwired/dactyl_manuform/4x6_5/rules.mk
+++ b/keyboards/handwired/dactyl_manuform/4x6_5/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = caterina
-
 # Build Options
 #   change yes to no to disable
 #
--- a/keyboards/handwired/dactyl_manuform/5x6/info.json
+++ b/keyboards/handwired/dactyl_manuform/5x6/info.json
@@ -8,6 +8,8 @@
        "pid": "0x3536",
        "device_version": "0.0.1"
    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
    "layouts": {
        "LAYOUT_5x6": {
            "layout": [
--- a/keyboards/handwired/dactyl_manuform/5x6/rules.mk
+++ b/keyboards/handwired/dactyl_manuform/5x6/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = caterina
-
 # Build Options
 #   change yes to no to disable
 #
--- a/keyboards/handwired/dactyl_manuform/5x6_2_5/info.json
+++ b/keyboards/handwired/dactyl_manuform/5x6_2_5/info.json
@@ -8,6 +8,8 @@
        "pid": "0x3536",
        "device_version": "0.0.3"
    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
    "layouts": {
        "LAYOUT_5x6_2_5": {
            "layout": [
--- a/keyboards/handwired/dactyl_manuform/5x6_2_5/rules.mk
+++ b/keyboards/handwired/dactyl_manuform/5x6_2_5/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = caterina
-
 # Build Options
 #   change yes to no to disable
 #
--- a/keyboards/handwired/dactyl_manuform/5x6_5/info.json
+++ b/keyboards/handwired/dactyl_manuform/5x6_5/info.json
@@ -8,6 +8,8 @@
        "pid": "0x3536",
        "device_version": "0.0.2"
    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
    "layouts": {
        "LAYOUT_5x6_5": {
            "layout": [
--- a/keyboards/handwired/dactyl_manuform/5x6_5/rules.mk
+++ b/keyboards/handwired/dactyl_manuform/5x6_5/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = caterina
-
 # Build Options
 #   change yes to no to disable
 #
--- a/keyboards/handwired/dactyl_manuform/5x6_6/info.json
+++ b/keyboards/handwired/dactyl_manuform/5x6_6/info.json
@@ -8,6 +8,8 @@
        "pid": "0x3536",
        "device_version": "0.0.3"
    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
    "layouts": {
        "LAYOUT_split_5x6_6": {
            "layout": [
--- a/keyboards/handwired/dactyl_manuform/5x6_6/rules.mk
+++ b/keyboards/handwired/dactyl_manuform/5x6_6/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = caterina
-
 # Build Options
 #   change yes to no to disable
 #
--- a/keyboards/handwired/dactyl_manuform/5x7/info.json
+++ b/keyboards/handwired/dactyl_manuform/5x7/info.json
@@ -8,6 +8,8 @@
        "pid": "0x3537",
        "device_version": "0.0.1"
    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
    "layouts": {
        "LAYOUT_5x7": {
            "layout": [
--- a/keyboards/handwired/dactyl_manuform/5x7/rules.mk
+++ b/keyboards/handwired/dactyl_manuform/5x7/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = caterina
-
 # Build Options
 #   change yes to no to disable
 #
--- a/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/info.json
+++ b/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/info.json
@@ -0,0 +1,5 @@
+{
+    "processor": "STM32F411",
+    "bootloader": "stm32-dfu",
+    "board": "BLACKPILL_STM32_F411"
+}
--- a/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/rules.mk
+++ b/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/rules.mk
@@ -1,13 +1,3 @@
-# Copyright 2021 Bartosz Nowak (@dumam)
-# SPDX-License-Identifier: GPL-2.0-or-later
-
-# MCU name
-MCU = STM32F411
-BOARD = BLACKPILL_STM32_F411
-
-# Bootloader selection
-BOOTLOADER = tinyuf2
-
 # Build Options
 #   change yes to no to disable
 #
--- a/keyboards/handwired/dactyl_manuform/6x6/promicro/info.json
+++ b/keyboards/handwired/dactyl_manuform/6x6/promicro/info.json
@@ -0,0 +1,4 @@
+{
+    "processor": "atmega32u4",
+    "bootloader": "caterina"
+}
--- a/keyboards/handwired/dactyl_manuform/6x6/promicro/rules.mk
+++ b/keyboards/handwired/dactyl_manuform/6x6/promicro/rules.mk
@@ -1,8 +0,0 @@
-# Copyright 2021 Bartosz Nowak (@dumam)
-# SPDX-License-Identifier: GPL-2.0-or-later
-
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = caterina
--- a/keyboards/handwired/dactyl_manuform/6x6_4/info.json
+++ b/keyboards/handwired/dactyl_manuform/6x6_4/info.json
@@ -8,6 +8,8 @@
        "pid": "0x3636",
        "device_version": "0.0.1"
    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
    "layouts": {
        "LAYOUT_6x6_4": {
            "layout": [
--- a/keyboards/handwired/dactyl_manuform/6x6_4/rules.mk
+++ b/keyboards/handwired/dactyl_manuform/6x6_4/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = caterina
-
 # Build Options
 #   change yes to no to disable
 #
--- a/keyboards/handwired/dactyl_manuform/6x6_kinesis/info.json
+++ b/keyboards/handwired/dactyl_manuform/6x6_kinesis/info.json
@@ -8,6 +8,8 @@
        "pid": "0x3636",
        "device_version": "0.0.1"
    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
    "layouts": {
        "LAYOUT_6x6_kinesis": {
            "layout": [
--- a/keyboards/handwired/dactyl_manuform/6x6_kinesis/rules.mk
+++ b/keyboards/handwired/dactyl_manuform/6x6_kinesis/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = caterina
-
 # Build Options
 #   change yes to no to disable
 #
--- a/keyboards/handwired/dactyl_manuform/6x7/info.json
+++ b/keyboards/handwired/dactyl_manuform/6x7/info.json
@@ -8,6 +8,8 @@
        "pid": "0x3636",
        "device_version": "0.0.1"
    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
    "layouts": {
        "LAYOUT_6x7": {
            "layout": [
--- a/keyboards/handwired/dactyl_manuform/6x7/rules.mk
+++ b/keyboards/handwired/dactyl_manuform/6x7/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = caterina
-
 # Build Options
 #   change yes to no to disable
 #