1 files changed, 15 insertions, 18 deletions

diff --git a/tmk_core/common.mk b/tmk_core/common.mk
index 63de7c7ed..fdf2aa097 100644
--- a/tmk_core/common.mk
+++ b/tmk_core/common.mk
@@ -99,8 +99,16 @@ ifeq ($(strip $(COMMAND_ENABLE)), yes)
 endif
 
 ifeq ($(strip $(NKRO_ENABLE)), yes)
-    TMK_COMMON_DEFS += -DNKRO_ENABLE
-    SHARED_EP_ENABLE = yes
+    ifeq ($(PROTOCOL), VUSB)
+        $(info NKRO is not currently supported on V-USB, and has been disabled.)
+    else ifeq ($(strip $(BLUETOOTH_ENABLE)), yes)
+        $(info NKRO is not currently supported with Bluetooth, and has been disabled.)
+    else ifneq ($(BLUETOOTH),)
+        $(info NKRO is not currently supported with Bluetooth, and has been disabled.)
+    else
+        TMK_COMMON_DEFS += -DNKRO_ENABLE
+        SHARED_EP_ENABLE = yes
+    endif
 endif
 
 ifeq ($(strip $(USB_6KRO_ENABLE)), yes)
@@ -113,10 +121,6 @@ ifeq ($(strip $(SLEEP_LED_ENABLE)), yes)
     TMK_COMMON_DEFS += -DNO_SUSPEND_POWER_DOWN
 endif
 
-ifeq ($(strip $(NO_UART)), yes)
-    TMK_COMMON_DEFS += -DNO_UART
-endif
-
 ifeq ($(strip $(NO_SUSPEND_POWER_DOWN)), yes)
     TMK_COMMON_DEFS += -DNO_SUSPEND_POWER_DOWN
 endif
@@ -132,12 +136,6 @@ ifeq ($(strip $(BLUETOOTH)), AdafruitBLE)
         TMK_COMMON_DEFS += -DNO_USB_STARTUP_CHECK
 endif
 
-ifeq ($(strip $(BLUETOOTH)), AdafruitEZKey)
-        TMK_COMMON_DEFS += -DBLUETOOTH_ENABLE
-        TMK_COMMON_DEFS += -DMODULE_ADAFRUIT_EZKEY
-    TMK_COMMON_DEFS += -DNO_USB_STARTUP_CHECK
-endif
-
 ifeq ($(strip $(BLUETOOTH)), RN42)
         TMK_COMMON_DEFS += -DBLUETOOTH_ENABLE
         TMK_COMMON_DEFS += -DMODULE_RN42
@@ -160,16 +158,15 @@ ifeq ($(strip $(SHARED_EP_ENABLE)), yes)
 endif
 
 ifeq ($(strip $(LTO_ENABLE)), yes)
-    LINK_TIME_OPTIMIZATION_ENABLE = yes
-endif
-
-ifeq ($(strip $(LINK_TIME_OPTIMIZATION_ENABLE)), yes)
     ifeq ($(PLATFORM),CHIBIOS)
         $(info Enabling LTO on ChibiOS-targeting boards is known to have a high likelihood of failure.)
-        $(info If unsure, set LINK_TIME_OPTIMIZATION_ENABLE = no.)
+        $(info If unsure, set LTO_ENABLE = no.)
     endif
     EXTRAFLAGS += -flto
-    TMK_COMMON_DEFS += -DLINK_TIME_OPTIMIZATION_ENABLE
+    TMK_COMMON_DEFS += -DLTO_ENABLE
+    TMK_COMMON_DEFS += -DLINK_TIME_OPTIMIZATON_ENABLE
+else ifdef LINK_TIME_OPTIMIZATION_ENABLE
+    $(error The LINK_TIME_OPTIMIZATION_ENABLE flag has been renamed to LTO_ENABLE.)
 endif
 
 # Search Path