From 40122c28e026ab2da6dd784b66fd8de2b6dc1fed Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Fri, 4 Nov 2022 05:26:18 +1100
Subject: [PATCH] Resolve info.json/rules.mk feature conflicts in three boards
 (#18942)

---
 keyboards/0_sixty/info.json               |  9 +++++++++
 keyboards/0_sixty/rules.mk                | 20 --------------------
 keyboards/handwired/reclined/info.json    |  8 +-------
 keyboards/handwired/reclined/rules.mk     | 19 +------------------
 keyboards/makenova/omega/omega4/info.json |  2 --
 keyboards/makenova/omega/omega4/rules.mk  | 19 +------------------
 6 files changed, 12 insertions(+), 65 deletions(-)

diff --git a/keyboards/0_sixty/info.json b/keyboards/0_sixty/info.json
index 7fc718c6027..154f7bd442c 100644
--- a/keyboards/0_sixty/info.json
+++ b/keyboards/0_sixty/info.json
@@ -6,6 +6,15 @@
         "vid": "0x7654",
         "device_version": "0.0.1"
     },
+    "features": {
+        "extrakey": true,
+        "console": true,
+        "command": true,
+        "nkro": true,
+        "lto": true
+    },
+    "processor": "atmega32u4",
+    "bootloader": "caterina",
     "layouts": {
 	"LAYOUT_1x2uC": {
             "layout": [
diff --git a/keyboards/0_sixty/rules.mk b/keyboards/0_sixty/rules.mk
index 18f45534c83..a0d06a89dd7 100644
--- a/keyboards/0_sixty/rules.mk
+++ b/keyboards/0_sixty/rules.mk
@@ -1,21 +1 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = caterina
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-
-LTO_ENABLE = yes            # Link-time opt
-
 DEFAULT_FOLDER = 0_sixty/base
diff --git a/keyboards/handwired/reclined/info.json b/keyboards/handwired/reclined/info.json
index a5f308fa757..bc928b2b44e 100644
--- a/keyboards/handwired/reclined/info.json
+++ b/keyboards/handwired/reclined/info.json
@@ -6,16 +6,10 @@
   "debounce": 5,
   "diode_direction": "ROW2COL",
   "features": {
-    "audio": false,
-    "backlight": false,
-    "bootmagic": false,
     "command": true,
     "console": true,
     "extrakey": true,
-    "mousekey": true,
-    "nkro": false,
-    "sleep_led": false,
-    "unicode": false
+    "mousekey": true
   },
   "matrix_pins": {
     "cols": ["B2", "F4", "B3", "F5", "B1", "F6", "D4", "D7", "D0", "E6", "D1", "B4"],
diff --git a/keyboards/handwired/reclined/rules.mk b/keyboards/handwired/reclined/rules.mk
index 64e496d0302..6e7633bfe01 100644
--- a/keyboards/handwired/reclined/rules.mk
+++ b/keyboards/handwired/reclined/rules.mk
@@ -1,18 +1 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = atmel-dfu
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = no        # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
+# This file intentionally left blank
diff --git a/keyboards/makenova/omega/omega4/info.json b/keyboards/makenova/omega/omega4/info.json
index 5e9bf225959..437f8509639 100644
--- a/keyboards/makenova/omega/omega4/info.json
+++ b/keyboards/makenova/omega/omega4/info.json
@@ -6,8 +6,6 @@
     "diode_direction": "COL2ROW",
     "features": {
         "bootmagic": true,
-        "command": false,
-        "console": false,
         "extrakey": true,
         "mousekey": true,
         "nkro": true
diff --git a/keyboards/makenova/omega/omega4/rules.mk b/keyboards/makenova/omega/omega4/rules.mk
index 515ca5621f8..6e7633bfe01 100644
--- a/keyboards/makenova/omega/omega4/rules.mk
+++ b/keyboards/makenova/omega/omega4/rules.mk
@@ -1,18 +1 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = caterina
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
+# This file intentionally left blank