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/0xc7/61key/info.json
+++ b/keyboards/0xc7/61key/info.json
@ -8,6 +8,8 @@
        "pid": "0x6161",
        "device_version": "0.0.1"
    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
    "layout_aliases": {
        "LAYOUT": "LAYOUT_60_ansi"
    },
--- a/keyboards/0xc7/61key/rules.mk
+++ b/keyboards/0xc7/61key/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/0xcb/1337/info.json
+++ b/keyboards/0xcb/1337/info.json
@ -8,6 +8,8 @@
    "pid": "0x1337",
    "device_version": "0.0.1"
  },
+  "processor": "atmega32u4",
+  "bootloader": "qmk-dfu",
  "layouts": {
    "LAYOUT": {
      "layout": [
--- a/keyboards/0xcb/1337/rules.mk
+++ b/keyboards/0xcb/1337/rules.mk
@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = qmk-dfu
-
 # Build Options
 #   change yes to no to disable
 #
--- a/keyboards/0xcb/static/info.json
+++ b/keyboards/0xcb/static/info.json
@ -8,6 +8,8 @@
    "pid": "0xA455",
    "device_version": "0.0.1"
  },
+  "processor": "atmega328p",
+  "bootloader": "usbasploader",
  "layout_aliases": {
    "LAYOUT": "LAYOUT_all"
  },
--- a/keyboards/0xcb/static/rules.mk
+++ b/keyboards/0xcb/static/rules.mk
@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega328p
-
-# Bootloader selection
-BOOTLOADER = usbasploader
-
 # Build Options
 #   change yes to no to disable
 #
--- a/keyboards/0xcb/tutelpad/info.json
+++ b/keyboards/0xcb/tutelpad/info.json
@ -8,6 +8,8 @@
        "pid": "0xF09F",
        "device_version": "0.0.1"
    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
    "layouts": {
        "LAYOUT": {
            "layout": [
--- a/keyboards/0xcb/tutelpad/rules.mk
+++ b/keyboards/0xcb/tutelpad/rules.mk
@ -1,9 +1,3 @@
-## MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = caterina
-
 # Build Options
 #   change yes to no to disable
 #
--- a/keyboards/10bleoledhub/info.json
+++ b/keyboards/10bleoledhub/info.json
@ -8,6 +8,8 @@
        "pid": "0x7C99",
        "device_version": "0.0.1"
    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
    "layouts": {
        "LAYOUT": {
            "layout": [
--- a/keyboards/10bleoledhub/rules.mk
+++ b/keyboards/10bleoledhub/rules.mk
@ -1,12 +1,6 @@
-# MCU name
-MCU = atmega32u4
-
 # Processor frequency
 F_CPU = 8000000

-# Bootloader selection
-BOOTLOADER = caterina
-
 # Build Options
 #   change yes to no to disable
 #
--- a/keyboards/1upkeyboards/1up60hse/info.json
+++ b/keyboards/1upkeyboards/1up60hse/info.json
@ -8,6 +8,8 @@
        "pid": "0x6873",
        "device_version": "0.0.1"
    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
    "community_layouts": ["60_ansi"],
    "layouts": {
        "LAYOUT_60_ansi": {
--- a/keyboards/1upkeyboards/1up60hse/rules.mk
+++ b/keyboards/1upkeyboards/1up60hse/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/1upkeyboards/1up60hte/info.json
+++ b/keyboards/1upkeyboards/1up60hte/info.json
@ -8,6 +8,8 @@
        "pid": "0x6874",
        "device_version": "0.0.1"
    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
    "layout_aliases": {
        "LAYOUT_tsangan": "LAYOUT_60_tsangan_hhkb"
    },
--- a/keyboards/1upkeyboards/1up60hte/rules.mk
+++ b/keyboards/1upkeyboards/1up60hte/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/1upkeyboards/1up60rgb/info.json
+++ b/keyboards/1upkeyboards/1up60rgb/info.json
@ -8,6 +8,8 @@
    "pid": "0x7267",
    "device_version": "0.0.1"
  },
+  "processor": "atmega32u4",
+  "bootloader": "atmel-dfu",
  "community_layouts": ["60_ansi", "60_iso", "60_ansi_split_bs_rshift", "60_hhkb"],
  "layouts": {
    "LAYOUT_all": {
--- a/keyboards/1upkeyboards/1up60rgb/rules.mk
+++ b/keyboards/1upkeyboards/1up60rgb/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/1upkeyboards/pi40/info.json
+++ b/keyboards/1upkeyboards/pi40/info.json
@ -6,6 +6,9 @@
        "pid": "0x5600",
        "device_version": "0.0.1"
    },
+    "processor": "RP2040",
+    "bootloader": "rp2040",
+    "board": "GENERIC_RP_RP2040",
    "layouts": {
        "LAYOUT": {
            "layout": [
--- a/keyboards/1upkeyboards/pi40/rules.mk
+++ b/keyboards/1upkeyboards/pi40/rules.mk
@ -1,8 +1,3 @@
-# MCU name
-MCU = RP2040
-BOOTLOADER = rp2040
-BOARD = GENERIC_RP_RP2040
-
 # Build Options
 #   change yes to no to disable
 #
--- a/keyboards/1upkeyboards/super16/info.json
+++ b/keyboards/1upkeyboards/super16/info.json
@ -8,6 +8,8 @@
    "pid": "0x5516",
    "device_version": "0.0.1"
  },
+  "processor": "atmega32u4",
+  "bootloader": "caterina",
  "community_layouts": ["ortho_4x4", "numpad_4x4"],
  "layouts": {
    "LAYOUT_ortho_4x4": {
--- a/keyboards/1upkeyboards/super16/rules.mk
+++ b/keyboards/1upkeyboards/super16/rules.mk
@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = caterina
-
 # Build Options
 #   change yes to no to disable
 #
--- a/keyboards/1upkeyboards/super16v2/info.json
+++ b/keyboards/1upkeyboards/super16v2/info.json
@ -8,6 +8,8 @@
      "pid": "0x5517",
      "device_version": "0.0.1"
    },
+    "processor": "atmega32u2",
+    "bootloader": "atmel-dfu",
    "layouts": {
      "LAYOUT_ortho_4x4": {
        "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}]
--- a/keyboards/1upkeyboards/super16v2/rules.mk
+++ b/keyboards/1upkeyboards/super16v2/rules.mk
@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u2
-
-# Bootloader selection
-BOOTLOADER = atmel-dfu
-
 # Build Options
 #   change yes to no to disable
 #
--- a/keyboards/1upkeyboards/sweet16/v1/info.json
+++ b/keyboards/1upkeyboards/sweet16/v1/info.json
@ -2,5 +2,7 @@
    "usb": {
        "pid": "0x0161",
        "device_version": "0.0.1"
-    }
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina"
 }
--- a/keyboards/1upkeyboards/sweet16/v1/rules.mk
+++ b/keyboards/1upkeyboards/sweet16/v1/rules.mk
@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = caterina
-
 RGBLIGHT_ENABLE = yes
 BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality

--- a/keyboards/25keys/aleth42/rev0/info.json
+++ b/keyboards/25keys/aleth42/rev0/info.json
@ -1,5 +1,7 @@
 {
    "usb": {
        "device_version": "0.0.0"
-    }
+    },
+    "processor": "atmega32u2",
+    "bootloader": "atmel-dfu"
 }
--- a/keyboards/25keys/aleth42/rev0/rules.mk
+++ b/keyboards/25keys/aleth42/rev0/rules.mk
@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u2
-
-# Bootloader selection
-BOOTLOADER = atmel-dfu
-
 # Build Options
 #   change yes to no to disable
 #
--- a/keyboards/25keys/aleth42/rev1/info.json
+++ b/keyboards/25keys/aleth42/rev1/info.json
@ -1,5 +1,7 @@
 {
    "usb": {
        "device_version": "0.0.1"
-    }
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu"
 }
--- a/keyboards/25keys/aleth42/rev1/rules.mk
+++ b/keyboards/25keys/aleth42/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/25keys/cassette42/info.json
+++ b/keyboards/25keys/cassette42/info.json
@ -8,6 +8,8 @@
        "pid": "0xCA42",
        "device_version": "0.0.1"
    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
    "layouts": {
        "LAYOUT": {
            "layout": [{"x":0.5, "y":0.75}, {"x":2.5, "y":0.75}, {"x":0, "y":1.75}, {"x":1, "y":1.75}, {"x":2, "y":1.75}, {"x":3, "y":1.75}]
--- a/keyboards/25keys/cassette42/rules.mk
+++ b/keyboards/25keys/cassette42/rules.mk
@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = caterina
-
 # Build Options
 #   change yes to no to disable
 #
--- a/Show More
+++ b/Show More