4 files changed, 4 insertions, 12 deletions
diff --git a/keyboards/hhkb/jp/info.json b/keyboards/hhkb/jp/info.json
index dd1cfbc870..cc05d105bf 100644
--- a/keyboards/hhkb/jp/info.json
+++ b/keyboards/hhkb/jp/info.json
@@ -8,6 +8,8 @@
     "pid": "0x0002",
     "device_version": "1.0.4"
   },
+  "processor": "atmega32u4",
+  "bootloader": "atmel-dfu",
   "layouts": {
     "LAYOUT_jp": {
       "layout": [
diff --git a/keyboards/hhkb/jp/rules.mk b/keyboards/hhkb/jp/rules.mk
index ae0710e028..2979c855c7 100644
--- a/keyboards/hhkb/jp/rules.mk
+++ b/keyboards/hhkb/jp/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/hhkb/yang/info.json b/keyboards/hhkb/yang/info.json
index 1378032eea..6c5bdcf1f6 100644
--- a/keyboards/hhkb/yang/info.json
+++ b/keyboards/hhkb/yang/info.json
@@ -8,6 +8,8 @@
     "pid": "0x0001",
     "device_version": "1.0.4"
   },
+  "processor": "atmega32u4",
+  "bootloader": "lufa-ms",
   "debounce": 0,
   "community_layouts": ["60_hhkb"],
   "layouts": {
diff --git a/keyboards/hhkb/yang/rules.mk b/keyboards/hhkb/yang/rules.mk
index ace12412fe..71ec705822 100644
--- a/keyboards/hhkb/yang/rules.mk
+++ b/keyboards/hhkb/yang/rules.mk
@@ -1,12 +1,6 @@
-# MCU name
-MCU = atmega32u4
-
 # MCU frequency
 F_CPU = 8000000
 
-# Bootloader selection
-BOOTLOADER = lufa-ms
-
 # Build Options
 #   change yes to no to disable
 #