summaryrefslogtreecommitdiff
path: root/keyboards/merge/um70
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/merge/um70')
-rw-r--r--keyboards/merge/um70/keymaps/via/rules.mk5
-rw-r--r--keyboards/merge/um70/rules.mk2
2 files changed, 5 insertions, 2 deletions
diff --git a/keyboards/merge/um70/keymaps/via/rules.mk b/keyboards/merge/um70/keymaps/via/rules.mk
index 56de955c27..cc9055e91e 100644
--- a/keyboards/merge/um70/keymaps/via/rules.mk
+++ b/keyboards/merge/um70/keymaps/via/rules.mk
@@ -1,3 +1,6 @@
VIA_ENABLE = yes
WPM_ENABLE = yes
-LTO_ENABLE = yes \ No newline at end of file
+LTO_ENABLE = yes
+SPACE_CADET_ENABLE = no
+GRAVE_ESC_ENABLE = no
+MAGIC_ENABLE = no
diff --git a/keyboards/merge/um70/rules.mk b/keyboards/merge/um70/rules.mk
index 4e4abc1d80..63b5400b48 100644
--- a/keyboards/merge/um70/rules.mk
+++ b/keyboards/merge/um70/rules.mk
@@ -7,7 +7,7 @@ BOOTLOADER = atmel-dfu
# Build Options
# change yes to no to disable
#
-BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = lite # Enable Bootmagic Lite
MOUSEKEY_ENABLE = yes # Mouse keys
EXTRAKEY_ENABLE = yes # Audio control and System control
CONSOLE_ENABLE = no # Console for debug