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/keebio/bamfk1/info.json
+++ b/keyboards/keebio/bamfk1/info.json
@@ -8,6 +8,8 @@
        "pid": "0x1111",
        "device_version": "0.0.1"
    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
    "layouts": {
        "LAYOUT": {
            "layout": [
--- a/keyboards/keebio/bamfk1/rules.mk
+++ b/keyboards/keebio/bamfk1/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/keebio/bamfk4/info.json
+++ b/keyboards/keebio/bamfk4/info.json
@@ -8,6 +8,8 @@
        "pid": "0x1114",
        "device_version": "0.0.1"
    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
    "layouts": {
        "LAYOUT": {
            "layout": [
--- a/keyboards/keebio/bamfk4/rules.mk
+++ b/keyboards/keebio/bamfk4/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/keebio/bdn9/rev1/info.json
+++ b/keyboards/keebio/bdn9/rev1/info.json
@@ -3,5 +3,7 @@
    "usb": {
        "pid": "0x1133",
        "device_version": "1.0.0"
-    }
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina"
 }
--- a/keyboards/keebio/bdn9/rev1/rules.mk
+++ b/keyboards/keebio/bdn9/rev1/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = caterina
-
 # Build Options
 #   change yes to no to disable
 #
--- a/keyboards/keebio/bdn9/rev2/info.json
+++ b/keyboards/keebio/bdn9/rev2/info.json
@@ -3,5 +3,7 @@
    "usb": {
        "pid": "0x2133",
        "device_version": "2.0.0"
-    }
+    },
+    "processor": "STM32F072",
+    "bootloader": "stm32-dfu"
 }
--- a/keyboards/keebio/bdn9/rev2/rules.mk
+++ b/keyboards/keebio/bdn9/rev2/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/keebio/bfo9000/info.json
+++ b/keyboards/keebio/bfo9000/info.json
@@ -8,6 +8,8 @@
      "pid": "0x1169",
      "device_version": "1.0.0"
    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
    "layouts": {
      "LAYOUT": {
        "layout": [
--- a/keyboards/keebio/bfo9000/rules.mk
+++ b/keyboards/keebio/bfo9000/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = caterina
-
 # Build Options
 #   change yes to no to disable
 #
--- a/keyboards/keebio/bigswitchseat/info.json
+++ b/keyboards/keebio/bigswitchseat/info.json
@@ -8,6 +8,8 @@
        "pid": "0x1011",
        "device_version": "0.0.1"
    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
    "layouts": {
        "LAYOUT": {
            "layout": [{"x": 0, "y": 0, "w": 4, "h": 4}]
--- a/keyboards/keebio/bigswitchseat/rules.mk
+++ b/keyboards/keebio/bigswitchseat/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/keebio/choconum/info.json
+++ b/keyboards/keebio/choconum/info.json
@@ -8,6 +8,8 @@
        "pid": "0x1154",
        "device_version": "1.0.0"
    },
+    "processor": "STM32F072",
+    "bootloader": "stm32-dfu",
    "community_layouts": ["ortho_5x4", "numpad_5x4"],
    "layouts": {
        "LAYOUT_numpad_5x4": {
--- a/keyboards/keebio/choconum/rules.mk
+++ b/keyboards/keebio/choconum/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/keebio/chocopad/info.json
+++ b/keyboards/keebio/chocopad/info.json
@@ -8,6 +8,8 @@
    "pid": "0x1144",
    "device_version": "1.0.0"
  },
+  "processor": "atmega32u4",
+  "bootloader": "caterina",
  "community_layouts": ["ortho_4x4"],
  "layouts": {
    "LAYOUT_ortho_4x4": {
--- a/keyboards/keebio/chocopad/rules.mk
+++ b/keyboards/keebio/chocopad/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = caterina
-
 # Build Options
 #   change yes to no to disable
 #
--- a/keyboards/keebio/dilly/info.json
+++ b/keyboards/keebio/dilly/info.json
@@ -8,6 +8,8 @@
    "pid": "0x113A",
    "device_version": "1.0.0"
  },
+  "processor": "atmega32u4",
+  "bootloader": "caterina",
  "community_layouts": ["ortho_3x10"],
  "layouts": {
    "LAYOUT_ortho_3x10": {
--- a/keyboards/keebio/dilly/rules.mk
+++ b/keyboards/keebio/dilly/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = caterina
-
 # Build Options
 #   change yes to no to disable
 #
--- a/keyboards/keebio/dsp40/rev1/info.json
+++ b/keyboards/keebio/dsp40/rev1/info.json
@@ -8,6 +8,8 @@
        "pid": "0x144C",
        "device_version": "1.0.0"
    },
+    "processor": "STM32F072",
+    "bootloader": "stm32-dfu",
    "layouts": {
        "LAYOUT": {
            "layout": [
--- a/keyboards/keebio/dsp40/rev1/rules.mk
+++ b/keyboards/keebio/dsp40/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/keebio/ergodicity/info.json
+++ b/keyboards/keebio/ergodicity/info.json
@@ -8,6 +8,8 @@
        "pid": "0x125F",
        "device_version": "0.0.1"
    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
    "layouts": {
        "LAYOUT": {
            "layout": [
--- a/keyboards/keebio/ergodicity/rules.mk
+++ b/keyboards/keebio/ergodicity/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/keebio/foldkb/rev1/info.json
+++ b/keyboards/keebio/foldkb/rev1/info.json
@@ -8,6 +8,8 @@
        "pid": "0x1258",
        "device_version": "1.0.0"
    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
    "layouts": {
        "LAYOUT": {
            "layout": [
--- a/keyboards/keebio/foldkb/rules.mk
+++ b/keyboards/keebio/foldkb/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/keebio/fourier/info.json
+++ b/keyboards/keebio/fourier/info.json
@@ -8,6 +8,8 @@
        "pid": "0x1247",
        "device_version": "1.0.0"
    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
    "layouts": {
        "LAYOUT": {
            "layout": [
--- a/keyboards/keebio/fourier/rules.mk
+++ b/keyboards/keebio/fourier/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = caterina
-
 # Build Options
 #   change yes to no to disable
 #
--- a/keyboards/keebio/iris/rev1/info.json
+++ b/keyboards/keebio/iris/rev1/info.json
@@ -3,5 +3,7 @@
    "usb": {
        "pid": "0x1256",
        "device_version": "1.0.0"
-    }
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina"
 }
--- a/keyboards/keebio/iris/rev1/rules.mk
+++ b/keyboards/keebio/iris/rev1/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = caterina
-
 # Build Options
 #   change yes to no to disable
 #
--- a/keyboards/keebio/iris/rev1_led/info.json
+++ b/keyboards/keebio/iris/rev1_led/info.json
@@ -3,5 +3,7 @@
    "usb": {
        "pid": "0x1256",
        "device_version": "1.1.0"
-    }
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina"
 }
--- a/keyboards/keebio/iris/rev1_led/rules.mk
+++ b/keyboards/keebio/iris/rev1_led/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = caterina
-
 # Build Options
 #   change yes to no to disable
 #
--- a/keyboards/keebio/iris/rev2/info.json
+++ b/keyboards/keebio/iris/rev2/info.json
@@ -3,5 +3,7 @@
    "usb": {
        "pid": "0x2256",
        "device_version": "2.0.0"
-    }
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina"
 }
--- a/keyboards/keebio/iris/rev2/rules.mk
+++ b/keyboards/keebio/iris/rev2/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = caterina
-
 # Build Options
 #   change yes to no to disable
 #
--- a/keyboards/keebio/iris/rev3/info.json
+++ b/keyboards/keebio/iris/rev3/info.json
@@ -3,5 +3,7 @@
    "usb": {
        "pid": "0x3256",
        "device_version": "3.0.0"
-    }
+    },
+    "processor": "atmega32u4",
+    "bootloader": "qmk-dfu"
 }
--- a/keyboards/keebio/iris/rev3/rules.mk
+++ b/keyboards/keebio/iris/rev3/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/keebio/iris/rev4/info.json
+++ b/keyboards/keebio/iris/rev4/info.json
@@ -3,5 +3,7 @@
    "usb": {
        "pid": "0x4256",
        "device_version": "4.0.0"
-    }
+    },
+    "processor": "atmega32u4",
+    "bootloader": "qmk-dfu"
 }
--- a/keyboards/keebio/iris/rev4/rules.mk
+++ b/keyboards/keebio/iris/rev4/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/keebio/iris/rev5/info.json
+++ b/keyboards/keebio/iris/rev5/info.json
@@ -3,5 +3,7 @@
    "usb": {
        "pid": "0x5256",
        "device_version": "5.0.0"
-    }
+    },
+    "processor": "atmega32u4",
+    "bootloader": "qmk-dfu"
 }
--- a/keyboards/keebio/iris/rev5/rules.mk
+++ b/keyboards/keebio/iris/rev5/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/keebio/iris/rev6/info.json
+++ b/keyboards/keebio/iris/rev6/info.json
@@ -3,5 +3,7 @@
    "usb": {
        "pid": "0x6256",
        "device_version": "6.0.0"
-    }
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu"
 }
--- a/keyboards/keebio/iris/rev6/rules.mk
+++ b/keyboards/keebio/iris/rev6/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/keebio/iris/rev6a/info.json
+++ b/keyboards/keebio/iris/rev6a/info.json
@@ -3,5 +3,7 @@
    "usb": {
        "pid": "0x6356",
        "device_version": "6.1.0"
-    }
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu"
 }
--- a/keyboards/keebio/iris/rev6a/rules.mk
+++ b/keyboards/keebio/iris/rev6a/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/keebio/iris/rev6b/info.json
+++ b/keyboards/keebio/iris/rev6b/info.json
@@ -3,5 +3,7 @@
    "usb": {
        "pid": "0x6456",
        "device_version": "6.2.0"
-    }
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu"
 }
--- a/keyboards/keebio/iris/rev6b/rules.mk
+++ b/keyboards/keebio/iris/rev6b/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/keebio/iris/rev7/info.json
+++ b/keyboards/keebio/iris/rev7/info.json
@@ -3,5 +3,7 @@
    "usb": {
        "pid": "0x7256",
        "device_version": "7.0.0"
-    }
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu"
 }
--- a/keyboards/keebio/iris/rev7/rules.mk
+++ b/keyboards/keebio/iris/rev7/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/keebio/kbo5000/rev1/info.json
+++ b/keyboards/keebio/kbo5000/rev1/info.json
@@ -8,6 +8,8 @@
        "pid": "0x126A",
        "device_version": "1.0.0"
    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
    "layouts": {
        "LAYOUT_ansi": {
            "layout": [
--- a/keyboards/keebio/kbo5000/rules.mk
+++ b/keyboards/keebio/kbo5000/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/keebio/laplace/info.json
+++ b/keyboards/keebio/laplace/info.json
@@ -8,6 +8,8 @@
        "pid": "0x1147",
        "device_version": "1.0.0"
    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
    "layouts": {
        "LAYOUT": {
            "layout": [
--- a/keyboards/keebio/laplace/rules.mk
+++ b/keyboards/keebio/laplace/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = caterina
-
 # Build Options
 #   change yes to no to disable
 #
--- a/keyboards/keebio/levinson/info.json
+++ b/keyboards/keebio/levinson/info.json
@@ -6,6 +6,8 @@
  "usb": {
    "vid": "0xCB10"
  },
+  "processor": "atmega32u4",
+  "bootloader": "caterina",
  "community_layouts": ["ortho_4x12"],
  "layouts": {
    "LAYOUT": {
--- a/keyboards/keebio/levinson/rules.mk
+++ b/keyboards/keebio/levinson/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = caterina
-
 # Build Options
 #   change yes to no to disable
 #
--- a/keyboards/keebio/nyquist/rev1/info.json
+++ b/keyboards/keebio/nyquist/rev1/info.json
@@ -3,5 +3,7 @@
    "usb": {
        "pid": "0x1156",
        "device_version": "1.0.0"
-    }
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina"
 }
--- a/keyboards/keebio/nyquist/rev1/rules.mk
+++ b/keyboards/keebio/nyquist/rev1/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = caterina
-
 # Build Options
 #   change yes to no to disable
 #
--- a/keyboards/keebio/nyquist/rev2/info.json
+++ b/keyboards/keebio/nyquist/rev2/info.json
@@ -3,5 +3,7 @@
    "usb": {
        "pid": "0x2156",
        "device_version": "2.0.0"
-    }
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina"
 }
--- a/keyboards/keebio/nyquist/rev2/rules.mk
+++ b/keyboards/keebio/nyquist/rev2/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = caterina
-
 # Build Options
 #   change yes to no to disable
 #
--- a/keyboards/keebio/nyquist/rev3/info.json
+++ b/keyboards/keebio/nyquist/rev3/info.json
@@ -3,5 +3,7 @@
    "usb": {
        "pid": "0x3156",
        "device_version": "3.0.0"
-    }
+    },
+    "processor": "atmega32u4",
+    "bootloader": "qmk-dfu"
 }
--- a/keyboards/keebio/nyquist/rev3/rules.mk
+++ b/keyboards/keebio/nyquist/rev3/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/keebio/quefrency/rev1/info.json
+++ b/keyboards/keebio/quefrency/rev1/info.json
@@ -8,6 +8,8 @@
        "pid": "0x1257",
        "device_version": "1.0.0"
    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
    "layouts": {
        "LAYOUT": {
            "layout": [
--- a/keyboards/keebio/quefrency/rev1/rules.mk
+++ b/keyboards/keebio/quefrency/rev1/rules.mk
@@ -1,3 +1 @@
-BOOTLOADER = caterina
-
 MOUSEKEY_ENABLE = yes       # Mouse keys
--- a/keyboards/keebio/quefrency/rev2/info.json
+++ b/keyboards/keebio/quefrency/rev2/info.json
@@ -8,6 +8,8 @@
        "pid": "0x2257",
        "device_version": "2.0.0"
    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
    "layout_aliases": {
        "LAYOUT": "LAYOUT_60"
    },
--- a/keyboards/keebio/quefrency/rev2/rules.mk
+++ b/keyboards/keebio/quefrency/rev2/rules.mk
@@ -1,4 +1,3 @@
-BOOTLOADER = atmel-dfu
 BACKLIGHT_ENABLE = yes
 RGBLIGHT_ENABLE = yes
 ENCODER_ENABLE = yes
--- a/keyboards/keebio/quefrency/rev3/info.json
+++ b/keyboards/keebio/quefrency/rev3/info.json
@@ -8,6 +8,8 @@
        "pid": "0x3357",
        "device_version": "3.1.0"
    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
    "layout_aliases": {
        "LAYOUT": "LAYOUT_60"
    },
--- a/keyboards/keebio/quefrency/rev3/rules.mk
+++ b/keyboards/keebio/quefrency/rev3/rules.mk
@@ -1,4 +1,3 @@
-BOOTLOADER = atmel-dfu
 BACKLIGHT_ENABLE = yes
 RGBLIGHT_ENABLE = yes
 ENCODER_ENABLE = yes
--- a/keyboards/keebio/quefrency/rev4/info.json
+++ b/keyboards/keebio/quefrency/rev4/info.json
@@ -8,6 +8,8 @@
        "pid": "0x4357",
        "device_version": "4.1.0"
    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
    "layout_aliases": {
        "LAYOUT": "LAYOUT_60"
    },
--- a/keyboards/keebio/quefrency/rev4/rules.mk
+++ b/keyboards/keebio/quefrency/rev4/rules.mk
@@ -1,4 +1,3 @@
-BOOTLOADER = atmel-dfu
 BACKLIGHT_ENABLE = no
 RGBLIGHT_ENABLE = yes
 ENCODER_ENABLE = yes
--- a/keyboards/keebio/quefrency/rev5/info.json
+++ b/keyboards/keebio/quefrency/rev5/info.json
@@ -8,6 +8,8 @@
        "pid": "0x5357",
        "device_version": "5.1.0"
    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
    "layout_aliases": {
        "LAYOUT": "LAYOUT_60"
    },
--- a/keyboards/keebio/quefrency/rev5/rules.mk
+++ b/keyboards/keebio/quefrency/rev5/rules.mk
@@ -1,4 +1,3 @@
-BOOTLOADER = atmel-dfu
 BACKLIGHT_ENABLE = no
 RGBLIGHT_ENABLE = yes
 ENCODER_ENABLE = yes
--- a/keyboards/keebio/quefrency/rules.mk
+++ b/keyboards/keebio/quefrency/rules.mk
@@ -1,6 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
 BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
 MOUSEKEY_ENABLE = no        # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
--- a/keyboards/keebio/rorschach/rev1/info.json
+++ b/keyboards/keebio/rorschach/rev1/info.json
@@ -8,6 +8,8 @@
    "pid": "0x1246",
    "device_version": "1.0.0"
  },
+  "processor": "atmega32u4",
+  "bootloader": "caterina",
  "layouts": {
    "LAYOUT": {
      "layout": [
--- a/keyboards/keebio/rorschach/rules.mk
+++ b/keyboards/keebio/rorschach/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = caterina
-
 # Build Options
 #   change yes to no to disable
 #
--- a/keyboards/keebio/stick/info.json
+++ b/keyboards/keebio/stick/info.json
@@ -8,6 +8,8 @@
        "pid": "0x111C",
        "device_version": "1.0.0"
    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
    "layouts": {
        "LAYOUT": {
            "layout": [
--- a/keyboards/keebio/stick/rules.mk
+++ b/keyboards/keebio/stick/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = caterina
-
 # Build Options
 #   change yes to no to disable
 #
--- a/keyboards/keebio/tragicforce68/info.json
+++ b/keyboards/keebio/tragicforce68/info.json
@@ -8,6 +8,8 @@
    "pid": "0x0510",
    "device_version": "1.0.1"
  },
+  "processor": "atmega32u4",
+  "bootloader": "caterina",
  "community_layouts": ["68_ansi"],
  "layouts": {
    "LAYOUT_68_ansi": {
--- a/keyboards/keebio/tragicforce68/rules.mk
+++ b/keyboards/keebio/tragicforce68/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = caterina
-
 # Build Options
 #   change yes to no to disable
 #
--- a/keyboards/keebio/tukey/info.json
+++ b/keyboards/keebio/tukey/info.json
@@ -8,6 +8,8 @@
      "pid": "0x1112",
      "device_version": "1.0.0"
    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
    "layouts": {
      "LAYOUT": {
        "layout": [
--- a/keyboards/keebio/tukey/rules.mk
+++ b/keyboards/keebio/tukey/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = caterina
-
 # Build Options
 #   change yes to no to disable
 #
--- a/keyboards/keebio/viterbi/info.json
+++ b/keyboards/keebio/viterbi/info.json
@@ -5,6 +5,8 @@
    "usb": {
        "vid": "0xCB10"
    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
    "community_layouts": ["ortho_5x14"],
    "layouts": {
        "LAYOUT": {
--- a/keyboards/keebio/viterbi/rules.mk
+++ b/keyboards/keebio/viterbi/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = caterina
-
 # Build Options
 #   change yes to no to disable
 #
--- a/keyboards/keebio/wavelet/info.json
+++ b/keyboards/keebio/wavelet/info.json
@@ -8,6 +8,8 @@
    "pid": "0x1046",
    "device_version": "1.0.0"
  },
+  "processor": "atmega32u4",
+  "bootloader": "caterina",
  "community_layouts": ["ortho_4x12"],
  "layouts": {
    "LAYOUT": {
--- a/keyboards/keebio/wavelet/rules.mk
+++ b/keyboards/keebio/wavelet/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = caterina
-
 # Build Options
 #   change yes to no to disable
 #
--- a/keyboards/keebio/wtf60/info.json
+++ b/keyboards/keebio/wtf60/info.json
@@ -8,6 +8,8 @@
        "pid": "0x1337",
        "device_version": "0.0.1"
    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
    "community_layouts": ["60_ansi"],
    "layouts": {
        "LAYOUT_full_wtf": {
--- a/keyboards/keebio/wtf60/rules.mk
+++ b/keyboards/keebio/wtf60/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = atmel-dfu
-
 # Build Options
 #   change yes to no to disable
 #