Merge commit '4d116a04e94cf0d19317d5b44e4fa9f34a3e5594'

[max/tmk_keyboard.git] / tmk_core / rules.mk

diff --git a/tmk_core/rules.mk b/tmk_core/rules.mk
index d06756638c32a5e2692cb1b77f040c56171cd1b2..a790f874bc9c93eb8d0fb3add10a177753767706 100644 (file)
--- a/tmk_core/rules.mk
+++ b/tmk_core/rules.mk
@@ -440,7 +440,11 @@ flip-ee: $(TARGET).hex $(TARGET).eep
        $(REMOVE) $(TARGET)eep.hex
 
 dfu-ee: $(TARGET).hex $(TARGET).eep
-       dfu-programmer $(MCU) eeprom-flash $(TARGET).eep
+ifneq (, $(findstring 0.7, $(shell dfu-programmer --version 2>&1)))
+       dfu-programmer $(MCU) flash --eeprom $(TARGET).eep
+else
+       dfu-programmer $(MCU) flash-eeprom $(TARGET).eep
+endif
        dfu-programmer $(MCU) reset