summaryrefslogtreecommitdiff
path: root/keyboards/chlx/merro60
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2023-02-08 18:41:46 +1100
committerGitHub <noreply@github.com>2023-02-08 18:41:46 +1100
commitf9aeea64c1f85d388485503e52035b5f7533ed26 (patch)
tree72808eb450b72eddac307395784c914cb22c0dd4 /keyboards/chlx/merro60
parent3499677b6a5a9ee5845122382f93f0500dfd8429 (diff)
Migrate `MCU` and `BOOTLOADER` to data-driven (#19529)
Diffstat (limited to 'keyboards/chlx/merro60')
-rw-r--r--keyboards/chlx/merro60/info.json2
-rw-r--r--keyboards/chlx/merro60/rules.mk6
2 files changed, 2 insertions, 6 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
#