diff options
| author | Ryan <fauxpark@gmail.com> | 2023-02-08 18:41:46 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-08 18:41:46 +1100 |
| commit | f9aeea64c1f85d388485503e52035b5f7533ed26 (patch) | |
| tree | 72808eb450b72eddac307395784c914cb22c0dd4 /keyboards/chlx | |
| parent | 3499677b6a5a9ee5845122382f93f0500dfd8429 (diff) | |
Migrate `MCU` and `BOOTLOADER` to data-driven (#19529)
Diffstat (limited to 'keyboards/chlx')
| -rw-r--r-- | keyboards/chlx/merro60/info.json | 2 | ||||
| -rw-r--r-- | keyboards/chlx/merro60/rules.mk | 6 | ||||
| -rw-r--r-- | keyboards/chlx/str_merro60/info.json | 2 | ||||
| -rw-r--r-- | keyboards/chlx/str_merro60/rules.mk | 6 |
4 files changed, 4 insertions, 12 deletions
diff --git a/keyboards/chlx/merro60/info.json b/keyboards/chlx/merro60/info.json index 99dc6a484a..bbb3124868 100644 --- a/keyboards/chlx/merro60/info.json +++ b/keyboards/chlx/merro60/info.json @@ -8,6 +8,8 @@ "pid": "0x0601", "device_version": "1.0.0" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT_default": "LAYOUT_all", "LAYOUT_hhkb": "LAYOUT_60_hhkb", diff --git a/keyboards/chlx/merro60/rules.mk b/keyboards/chlx/merro60/rules.mk index 476cf49f27..3b6a1809db 100644 --- a/keyboards/chlx/merro60/rules.mk +++ b/keyboards/chlx/merro60/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/chlx/str_merro60/info.json b/keyboards/chlx/str_merro60/info.json index 444d2d76e6..e9ab25aedb 100644 --- a/keyboards/chlx/str_merro60/info.json +++ b/keyboards/chlx/str_merro60/info.json @@ -8,6 +8,8 @@ "pid": "0x0602", "device_version": "1.0.0" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT_default": "LAYOUT_all", "LAYOUT_hhkb": "LAYOUT_60_hhkb", diff --git a/keyboards/chlx/str_merro60/rules.mk b/keyboards/chlx/str_merro60/rules.mk index d66c197e4d..9cceab1f74 100644 --- a/keyboards/chlx/str_merro60/rules.mk +++ b/keyboards/chlx/str_merro60/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # |