rule.mk: Add dfu-programmer version check again

[max/tmk_keyboard.git] / tmk_core / tool / chibios / common.mk

diff --git a/tmk_core/tool/chibios/common.mk b/tmk_core/tool/chibios/common.mk
index f0d39f318101c0845da871394f3b2aaaea7abcf6..1531c5757de211f0319f682ebc235de1747f4c5f 100644 (file)
--- a/tmk_core/tool/chibios/common.mk
+++ b/tmk_core/tool/chibios/common.mk
@@ -10,6 +10,7 @@ SRC +=        $(COMMON_DIR)/host.c \
        $(COMMON_DIR)/print.c \
        $(COMMON_DIR)/debug.c \
        $(COMMON_DIR)/util.c \
+       $(COMMON_DIR)/hook.c \
        $(COMMON_DIR)/chibios/suspend.c \
        $(COMMON_DIR)/chibios/printf.c \
        $(COMMON_DIR)/chibios/timer.c \
@@ -18,7 +19,6 @@ SRC +=        $(COMMON_DIR)/host.c \
 
 # Option modules
 ifdef BOOTMAGIC_ENABLE
-    $(error Bootmagic Not Supported)
     SRC += $(COMMON_DIR)/bootmagic.c
     SRC += $(COMMON_DIR)/chibios/eeconfig.c
     OPT_DEFS += -DBOOTMAGIC_ENABLE
@@ -81,9 +81,6 @@ endif
 OPT_DEFS += -DVERSION=$(shell (git describe --always --dirty || echo 'unknown') 2> /dev/null)
 
 # Bootloader address
-ifdef BOOTLOADER_ADDRESS
-    OPT_DEFS += -DBOOTLOADER_ADDRESS=$(BOOTLOADER_ADDRESS)
+ifdef STM32_BOOTLOADER_ADDRESS
+    OPT_DEFS += -DSTM32_BOOTLOADER_ADDRESS=$(STM32_BOOTLOADER_ADDRESS)
 endif
-
-# Search Path
-VPATH += $(TMK_DIR)/common