Merge remote-tracking branch 'tmk/master'

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

diff --git a/tmk_core/rules.mk b/tmk_core/rules.mk
index d06756638c32a5e2692cb1b77f040c56171cd1b2..860fc1a9310da970ebecba597c150802f522f37e 100644 (file)
--- a/tmk_core/rules.mk
+++ b/tmk_core/rules.mk
@@ -124,6 +124,7 @@ CFLAGS += -O$(OPT)
 CFLAGS += -funsigned-char
 CFLAGS += -funsigned-bitfields
 CFLAGS += -ffunction-sections
+CFLAGS += -fdata-sections
 CFLAGS += -fno-inline-small-functions
 CFLAGS += -fpack-struct
 CFLAGS += -fshort-enums
@@ -440,7 +441,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