From e680af98d2347222ba41b5affc941e6682e0ce34 Mon Sep 17 00:00:00 2001
From: kaylanm <1063516+kaylanm@users.noreply.github.com>
Date: Mon, 2 Nov 2020 16:23:05 -0500
Subject: [PATCH] Enable extrakeys, mousekeys for all VIA keymaps. (#10740)

---
 keyboards/1upkeyboards/1up60hse/keymaps/via/rules.mk      | 3 ++-
 keyboards/1upkeyboards/1up60hte/keymaps/via/rules.mk      | 1 -
 keyboards/aos/tkl/keymaps/via/rules.mk                    | 1 -
 keyboards/botanicalkeyboards/fm2u/keymaps/via/rules.mk    | 2 +-
 keyboards/coseyfannitutti/discipad/keymaps/via/rules.mk   | 1 -
 keyboards/coseyfannitutti/discipline/keymaps/via/rules.mk | 1 -
 keyboards/coseyfannitutti/romeo/keymaps/via/rules.mk      | 1 -
 keyboards/dm9records/plaid/keymaps/via/rules.mk           | 2 --
 keyboards/gray_studio/space65/keymaps/via/rules.mk        | 1 -
 .../gray_studio/think65/hotswap/keymaps/via/rules.mk      | 3 ++-
 keyboards/gray_studio/think65/solder/keymaps/via/rules.mk | 4 +++-
 keyboards/jj4x4/keymaps/via/rules.mk                      | 2 --
 keyboards/keycapsss/plaid_pad/keymaps/via/rules.mk        | 2 --
 keyboards/kira80/keymaps/via/rules.mk                     | 1 -
 keyboards/lazydesigners/dimple/keymaps/via/rules.mk       | 8 --------
 keyboards/lets_split/keymaps/via/rules.mk                 | 2 +-
 keyboards/noxary/220/keymaps/via/rules.mk                 | 1 -
 keyboards/noxary/268/keymaps/via/rules.mk                 | 1 -
 keyboards/noxary/268_2/keymaps/via/rules.mk               | 3 +--
 keyboards/noxary/280/keymaps/via/rules.mk                 | 1 -
 keyboards/noxary/x268/keymaps/via/rules.mk                | 1 -
 keyboards/percent/skog_lite/keymaps/via/rules.mk          | 3 ---
 keyboards/ramonimbao/herringbone/keymaps/via/rules.mk     | 2 --
 keyboards/reversestudio/decadepad/keymaps/via/rules.mk    | 1 -
 keyboards/sck/osa/keymaps/via/rules.mk                    | 3 ++-
 keyboards/singa/keymaps/via/rules.mk                      | 2 --
 keyboards/tgr/910/keymaps/via/rules.mk                    | 2 --
 keyboards/tgr/910ce/keymaps/via/rules.mk                  | 2 --
 keyboards/tgr/jane/keymaps/via/rules.mk                   | 3 ---
 keyboards/tgr/tris/keymaps/via/rules.mk                   | 2 --
 keyboards/thevankeyboards/minivan/keymaps/via/rules.mk    | 8 --------
 keyboards/unikorn/keymaps/via/rules.mk                    | 3 ---
 keyboards/winkeyless/bface/keymaps/via/rules.mk           | 3 ---
 keyboards/winkeyless/bmini/keymaps/via/rules.mk           | 3 ---
 keyboards/winkeyless/bminiex/keymaps/via/rules.mk         | 3 ---
 35 files changed, 12 insertions(+), 70 deletions(-)

diff --git a/keyboards/1upkeyboards/1up60hse/keymaps/via/rules.mk b/keyboards/1upkeyboards/1up60hse/keymaps/via/rules.mk
index 6305f94a35..44a2bc49cc 100644
--- a/keyboards/1upkeyboards/1up60hse/keymaps/via/rules.mk
+++ b/keyboards/1upkeyboards/1up60hse/keymaps/via/rules.mk
@@ -1,3 +1,4 @@
 VIA_ENABLE = yes
 LTO_ENABLE = yes
-MOUSEKEY_ENABLE = no
\ No newline at end of file
+
+CONSOLE_ENABLE = no
diff --git a/keyboards/1upkeyboards/1up60hte/keymaps/via/rules.mk b/keyboards/1upkeyboards/1up60hte/keymaps/via/rules.mk
index bee21da528..1e5b99807c 100644
--- a/keyboards/1upkeyboards/1up60hte/keymaps/via/rules.mk
+++ b/keyboards/1upkeyboards/1up60hte/keymaps/via/rules.mk
@@ -1,2 +1 @@
 VIA_ENABLE = yes
-MOUSEKEY_ENABLE = no
\ No newline at end of file
diff --git a/keyboards/aos/tkl/keymaps/via/rules.mk b/keyboards/aos/tkl/keymaps/via/rules.mk
index 96d2d189b2..1e5b99807c 100644
--- a/keyboards/aos/tkl/keymaps/via/rules.mk
+++ b/keyboards/aos/tkl/keymaps/via/rules.mk
@@ -1,2 +1 @@
 VIA_ENABLE = yes
-MOUSEKEY_ENABLE = no
diff --git a/keyboards/botanicalkeyboards/fm2u/keymaps/via/rules.mk b/keyboards/botanicalkeyboards/fm2u/keymaps/via/rules.mk
index 7d47e6b726..44a2bc49cc 100644
--- a/keyboards/botanicalkeyboards/fm2u/keymaps/via/rules.mk
+++ b/keyboards/botanicalkeyboards/fm2u/keymaps/via/rules.mk
@@ -1,4 +1,4 @@
 VIA_ENABLE = yes
 LTO_ENABLE = yes
 
-EXTRAKEY_ENABLE = no
+CONSOLE_ENABLE = no
diff --git a/keyboards/coseyfannitutti/discipad/keymaps/via/rules.mk b/keyboards/coseyfannitutti/discipad/keymaps/via/rules.mk
index fcb7b9eab6..36b7ba9cbc 100644
--- a/keyboards/coseyfannitutti/discipad/keymaps/via/rules.mk
+++ b/keyboards/coseyfannitutti/discipad/keymaps/via/rules.mk
@@ -1,3 +1,2 @@
 VIA_ENABLE = yes
 LTO_ENABLE = yes
-MOUSEKEY_ENABLE = no
diff --git a/keyboards/coseyfannitutti/discipline/keymaps/via/rules.mk b/keyboards/coseyfannitutti/discipline/keymaps/via/rules.mk
index fcb7b9eab6..36b7ba9cbc 100644
--- a/keyboards/coseyfannitutti/discipline/keymaps/via/rules.mk
+++ b/keyboards/coseyfannitutti/discipline/keymaps/via/rules.mk
@@ -1,3 +1,2 @@
 VIA_ENABLE = yes
 LTO_ENABLE = yes
-MOUSEKEY_ENABLE = no
diff --git a/keyboards/coseyfannitutti/romeo/keymaps/via/rules.mk b/keyboards/coseyfannitutti/romeo/keymaps/via/rules.mk
index fcb7b9eab6..36b7ba9cbc 100644
--- a/keyboards/coseyfannitutti/romeo/keymaps/via/rules.mk
+++ b/keyboards/coseyfannitutti/romeo/keymaps/via/rules.mk
@@ -1,3 +1,2 @@
 VIA_ENABLE = yes
 LTO_ENABLE = yes
-MOUSEKEY_ENABLE = no
diff --git a/keyboards/dm9records/plaid/keymaps/via/rules.mk b/keyboards/dm9records/plaid/keymaps/via/rules.mk
index 930e3552ad..1e5b99807c 100644
--- a/keyboards/dm9records/plaid/keymaps/via/rules.mk
+++ b/keyboards/dm9records/plaid/keymaps/via/rules.mk
@@ -1,3 +1 @@
 VIA_ENABLE = yes
-MOUSEKEY_ENABLE = no
-EXTRAKEY_ENABLE = no
diff --git a/keyboards/gray_studio/space65/keymaps/via/rules.mk b/keyboards/gray_studio/space65/keymaps/via/rules.mk
index 96d2d189b2..1e5b99807c 100644
--- a/keyboards/gray_studio/space65/keymaps/via/rules.mk
+++ b/keyboards/gray_studio/space65/keymaps/via/rules.mk
@@ -1,2 +1 @@
 VIA_ENABLE = yes
-MOUSEKEY_ENABLE = no
diff --git a/keyboards/gray_studio/think65/hotswap/keymaps/via/rules.mk b/keyboards/gray_studio/think65/hotswap/keymaps/via/rules.mk
index 96d2d189b2..e9977d2fe2 100644
--- a/keyboards/gray_studio/think65/hotswap/keymaps/via/rules.mk
+++ b/keyboards/gray_studio/think65/hotswap/keymaps/via/rules.mk
@@ -1,2 +1,3 @@
 VIA_ENABLE = yes
-MOUSEKEY_ENABLE = no
+
+CONSOLE_ENABLE = no
diff --git a/keyboards/gray_studio/think65/solder/keymaps/via/rules.mk b/keyboards/gray_studio/think65/solder/keymaps/via/rules.mk
index 96d2d189b2..44a2bc49cc 100644
--- a/keyboards/gray_studio/think65/solder/keymaps/via/rules.mk
+++ b/keyboards/gray_studio/think65/solder/keymaps/via/rules.mk
@@ -1,2 +1,4 @@
 VIA_ENABLE = yes
-MOUSEKEY_ENABLE = no
+LTO_ENABLE = yes
+
+CONSOLE_ENABLE = no
diff --git a/keyboards/jj4x4/keymaps/via/rules.mk b/keyboards/jj4x4/keymaps/via/rules.mk
index 82fb80d5e7..1e5b99807c 100644
--- a/keyboards/jj4x4/keymaps/via/rules.mk
+++ b/keyboards/jj4x4/keymaps/via/rules.mk
@@ -1,3 +1 @@
 VIA_ENABLE = yes
-EXTRAKEY_ENABLE = no
-MOUSEKEY_ENABLE = no
diff --git a/keyboards/keycapsss/plaid_pad/keymaps/via/rules.mk b/keyboards/keycapsss/plaid_pad/keymaps/via/rules.mk
index 00c11acccd..36b7ba9cbc 100644
--- a/keyboards/keycapsss/plaid_pad/keymaps/via/rules.mk
+++ b/keyboards/keycapsss/plaid_pad/keymaps/via/rules.mk
@@ -1,4 +1,2 @@
 VIA_ENABLE = yes
 LTO_ENABLE = yes
-EXTRAKEY_ENABLE = no
-MOUSEKEY_ENABLE = no
diff --git a/keyboards/kira80/keymaps/via/rules.mk b/keyboards/kira80/keymaps/via/rules.mk
index 981c7ad4cf..36b7ba9cbc 100644
--- a/keyboards/kira80/keymaps/via/rules.mk
+++ b/keyboards/kira80/keymaps/via/rules.mk
@@ -1,3 +1,2 @@
 VIA_ENABLE = yes
 LTO_ENABLE = yes
-EXTRAKEY_ENABLE = no
diff --git a/keyboards/lazydesigners/dimple/keymaps/via/rules.mk b/keyboards/lazydesigners/dimple/keymaps/via/rules.mk
index f2e549c7b7..36b7ba9cbc 100644
--- a/keyboards/lazydesigners/dimple/keymaps/via/rules.mk
+++ b/keyboards/lazydesigners/dimple/keymaps/via/rules.mk
@@ -1,10 +1,2 @@
 VIA_ENABLE = yes
 LTO_ENABLE = yes
-# These features are not (yet) supported by VIA
-LEADER_ENABLE = no
-FAUXCLICKY_ENABLE = no
-MIDI_ENABLE = no
-BLUETOOTH_ENABLE = no
-KEY_LOCK_ENABLE = no
-TERMINAL_ENABLE = no
-MOUSEKEY_ENABLE = no
diff --git a/keyboards/lets_split/keymaps/via/rules.mk b/keyboards/lets_split/keymaps/via/rules.mk
index 48e7e7f25f..92725994ca 100644
--- a/keyboards/lets_split/keymaps/via/rules.mk
+++ b/keyboards/lets_split/keymaps/via/rules.mk
@@ -1,4 +1,4 @@
 RGBLIGHT_ENABLE = yes 		# LED strips
 VIA_ENABLE = yes
 LTO_ENABLE = yes
-MOUSEKEY_ENABLE = no
+COMMAND_ENABLE = no
diff --git a/keyboards/noxary/220/keymaps/via/rules.mk b/keyboards/noxary/220/keymaps/via/rules.mk
index c2e96d233b..09b3a0b6fe 100644
--- a/keyboards/noxary/220/keymaps/via/rules.mk
+++ b/keyboards/noxary/220/keymaps/via/rules.mk
@@ -1,5 +1,4 @@
 VIA_ENABLE = yes
-MOUSEKEY_ENABLE = no
 CONSOLE_ENABLE = no        # Console for debug
 COMMAND_ENABLE = no        # Commands for debug and configuration
 LTO_ENABLE = yes
diff --git a/keyboards/noxary/268/keymaps/via/rules.mk b/keyboards/noxary/268/keymaps/via/rules.mk
index c2e96d233b..09b3a0b6fe 100644
--- a/keyboards/noxary/268/keymaps/via/rules.mk
+++ b/keyboards/noxary/268/keymaps/via/rules.mk
@@ -1,5 +1,4 @@
 VIA_ENABLE = yes
-MOUSEKEY_ENABLE = no
 CONSOLE_ENABLE = no        # Console for debug
 COMMAND_ENABLE = no        # Commands for debug and configuration
 LTO_ENABLE = yes
diff --git a/keyboards/noxary/268_2/keymaps/via/rules.mk b/keyboards/noxary/268_2/keymaps/via/rules.mk
index 1974f5d3f5..09b3a0b6fe 100644
--- a/keyboards/noxary/268_2/keymaps/via/rules.mk
+++ b/keyboards/noxary/268_2/keymaps/via/rules.mk
@@ -1,5 +1,4 @@
 VIA_ENABLE = yes
-MOUSEKEY_ENABLE = no
 CONSOLE_ENABLE = no        # Console for debug
 COMMAND_ENABLE = no        # Commands for debug and configuration
-LTO_ENABLE = yes
\ No newline at end of file
+LTO_ENABLE = yes
diff --git a/keyboards/noxary/280/keymaps/via/rules.mk b/keyboards/noxary/280/keymaps/via/rules.mk
index c2e96d233b..09b3a0b6fe 100644
--- a/keyboards/noxary/280/keymaps/via/rules.mk
+++ b/keyboards/noxary/280/keymaps/via/rules.mk
@@ -1,5 +1,4 @@
 VIA_ENABLE = yes
-MOUSEKEY_ENABLE = no
 CONSOLE_ENABLE = no        # Console for debug
 COMMAND_ENABLE = no        # Commands for debug and configuration
 LTO_ENABLE = yes
diff --git a/keyboards/noxary/x268/keymaps/via/rules.mk b/keyboards/noxary/x268/keymaps/via/rules.mk
index c2e96d233b..09b3a0b6fe 100644
--- a/keyboards/noxary/x268/keymaps/via/rules.mk
+++ b/keyboards/noxary/x268/keymaps/via/rules.mk
@@ -1,5 +1,4 @@
 VIA_ENABLE = yes
-MOUSEKEY_ENABLE = no
 CONSOLE_ENABLE = no        # Console for debug
 COMMAND_ENABLE = no        # Commands for debug and configuration
 LTO_ENABLE = yes
diff --git a/keyboards/percent/skog_lite/keymaps/via/rules.mk b/keyboards/percent/skog_lite/keymaps/via/rules.mk
index 97010a994b..36b7ba9cbc 100644
--- a/keyboards/percent/skog_lite/keymaps/via/rules.mk
+++ b/keyboards/percent/skog_lite/keymaps/via/rules.mk
@@ -1,5 +1,2 @@
 VIA_ENABLE = yes
 LTO_ENABLE = yes
-
-MOUSEKEY_ENABLE = no
-EXTRAKEY_ENABLE = no
diff --git a/keyboards/ramonimbao/herringbone/keymaps/via/rules.mk b/keyboards/ramonimbao/herringbone/keymaps/via/rules.mk
index 930e3552ad..1e5b99807c 100644
--- a/keyboards/ramonimbao/herringbone/keymaps/via/rules.mk
+++ b/keyboards/ramonimbao/herringbone/keymaps/via/rules.mk
@@ -1,3 +1 @@
 VIA_ENABLE = yes
-MOUSEKEY_ENABLE = no
-EXTRAKEY_ENABLE = no
diff --git a/keyboards/reversestudio/decadepad/keymaps/via/rules.mk b/keyboards/reversestudio/decadepad/keymaps/via/rules.mk
index bee21da528..1e5b99807c 100644
--- a/keyboards/reversestudio/decadepad/keymaps/via/rules.mk
+++ b/keyboards/reversestudio/decadepad/keymaps/via/rules.mk
@@ -1,2 +1 @@
 VIA_ENABLE = yes
-MOUSEKEY_ENABLE = no
\ No newline at end of file
diff --git a/keyboards/sck/osa/keymaps/via/rules.mk b/keyboards/sck/osa/keymaps/via/rules.mk
index bee21da528..e9977d2fe2 100644
--- a/keyboards/sck/osa/keymaps/via/rules.mk
+++ b/keyboards/sck/osa/keymaps/via/rules.mk
@@ -1,2 +1,3 @@
 VIA_ENABLE = yes
-MOUSEKEY_ENABLE = no
\ No newline at end of file
+
+CONSOLE_ENABLE = no
diff --git a/keyboards/singa/keymaps/via/rules.mk b/keyboards/singa/keymaps/via/rules.mk
index a823f59c43..8c8ed55d78 100644
--- a/keyboards/singa/keymaps/via/rules.mk
+++ b/keyboards/singa/keymaps/via/rules.mk
@@ -1,8 +1,6 @@
 VIA_ENABLE = yes
 LTO_ENABLE = yes
 
-MOUSEKEY_ENABLE = no
-EXTRAKEY_ENABLE = no
 COMMAND_ENABLE = no
 CONSOLE_ENABLE = no
 
diff --git a/keyboards/tgr/910/keymaps/via/rules.mk b/keyboards/tgr/910/keymaps/via/rules.mk
index 9e1952e236..36b7ba9cbc 100644
--- a/keyboards/tgr/910/keymaps/via/rules.mk
+++ b/keyboards/tgr/910/keymaps/via/rules.mk
@@ -1,4 +1,2 @@
 VIA_ENABLE = yes
 LTO_ENABLE = yes
-
-EXTRAKEY_ENABLE = no  
diff --git a/keyboards/tgr/910ce/keymaps/via/rules.mk b/keyboards/tgr/910ce/keymaps/via/rules.mk
index 71c94085a9..36b7ba9cbc 100644
--- a/keyboards/tgr/910ce/keymaps/via/rules.mk
+++ b/keyboards/tgr/910ce/keymaps/via/rules.mk
@@ -1,4 +1,2 @@
 VIA_ENABLE = yes
 LTO_ENABLE = yes
-
-EXTRAKEY_ENABLE = no       # Audio control and System control
\ No newline at end of file
diff --git a/keyboards/tgr/jane/keymaps/via/rules.mk b/keyboards/tgr/jane/keymaps/via/rules.mk
index 97010a994b..36b7ba9cbc 100644
--- a/keyboards/tgr/jane/keymaps/via/rules.mk
+++ b/keyboards/tgr/jane/keymaps/via/rules.mk
@@ -1,5 +1,2 @@
 VIA_ENABLE = yes
 LTO_ENABLE = yes
-
-MOUSEKEY_ENABLE = no
-EXTRAKEY_ENABLE = no
diff --git a/keyboards/tgr/tris/keymaps/via/rules.mk b/keyboards/tgr/tris/keymaps/via/rules.mk
index 7d47e6b726..36b7ba9cbc 100644
--- a/keyboards/tgr/tris/keymaps/via/rules.mk
+++ b/keyboards/tgr/tris/keymaps/via/rules.mk
@@ -1,4 +1,2 @@
 VIA_ENABLE = yes
 LTO_ENABLE = yes
-
-EXTRAKEY_ENABLE = no
diff --git a/keyboards/thevankeyboards/minivan/keymaps/via/rules.mk b/keyboards/thevankeyboards/minivan/keymaps/via/rules.mk
index f2e549c7b7..36b7ba9cbc 100644
--- a/keyboards/thevankeyboards/minivan/keymaps/via/rules.mk
+++ b/keyboards/thevankeyboards/minivan/keymaps/via/rules.mk
@@ -1,10 +1,2 @@
 VIA_ENABLE = yes
 LTO_ENABLE = yes
-# These features are not (yet) supported by VIA
-LEADER_ENABLE = no
-FAUXCLICKY_ENABLE = no
-MIDI_ENABLE = no
-BLUETOOTH_ENABLE = no
-KEY_LOCK_ENABLE = no
-TERMINAL_ENABLE = no
-MOUSEKEY_ENABLE = no
diff --git a/keyboards/unikorn/keymaps/via/rules.mk b/keyboards/unikorn/keymaps/via/rules.mk
index 7b439d08c6..58ecfdf5c2 100644
--- a/keyboards/unikorn/keymaps/via/rules.mk
+++ b/keyboards/unikorn/keymaps/via/rules.mk
@@ -1,7 +1,4 @@
 VIA_ENABLE = yes
 LTO_ENABLE = yes
 
-MOUSEKEY_ENABLE = no
-EXTRAKEY_ENABLE = no
 RGBLIGHT_ENABLE = yes
-
diff --git a/keyboards/winkeyless/bface/keymaps/via/rules.mk b/keyboards/winkeyless/bface/keymaps/via/rules.mk
index 97010a994b..36b7ba9cbc 100644
--- a/keyboards/winkeyless/bface/keymaps/via/rules.mk
+++ b/keyboards/winkeyless/bface/keymaps/via/rules.mk
@@ -1,5 +1,2 @@
 VIA_ENABLE = yes
 LTO_ENABLE = yes
-
-MOUSEKEY_ENABLE = no
-EXTRAKEY_ENABLE = no
diff --git a/keyboards/winkeyless/bmini/keymaps/via/rules.mk b/keyboards/winkeyless/bmini/keymaps/via/rules.mk
index 97010a994b..36b7ba9cbc 100644
--- a/keyboards/winkeyless/bmini/keymaps/via/rules.mk
+++ b/keyboards/winkeyless/bmini/keymaps/via/rules.mk
@@ -1,5 +1,2 @@
 VIA_ENABLE = yes
 LTO_ENABLE = yes
-
-MOUSEKEY_ENABLE = no
-EXTRAKEY_ENABLE = no
diff --git a/keyboards/winkeyless/bminiex/keymaps/via/rules.mk b/keyboards/winkeyless/bminiex/keymaps/via/rules.mk
index 97010a994b..36b7ba9cbc 100644
--- a/keyboards/winkeyless/bminiex/keymaps/via/rules.mk
+++ b/keyboards/winkeyless/bminiex/keymaps/via/rules.mk
@@ -1,5 +1,2 @@
 VIA_ENABLE = yes
 LTO_ENABLE = yes
-
-MOUSEKEY_ENABLE = no
-EXTRAKEY_ENABLE = no