summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrans de Jonge <fransdejonge@gmail.com>2020-09-13 03:17:47 +0200
committerDrashna Jael're <drashna@live.com>2020-09-30 03:52:05 -0700
commitedbb2c508216396a5d8a9100b0d58b1d2068aee8 (patch)
tree5b8f4ca66c9977a80dd7d32910017a10d1c4dc6c
parent6ebc9a2afa117756b7016d6de59c64970eb87e2e (diff)
[fix] dfu-programmer <0.7 doesn't support --force flag (#10292)
Fixes <https://github.com/qmk/qmk_firmware/issues/10286>.
-rw-r--r--tmk_core/avr.mk3
1 files changed, 2 insertions, 1 deletions
diff --git a/tmk_core/avr.mk b/tmk_core/avr.mk
index c2e1ae0630..dcdb6a449a 100644
--- a/tmk_core/avr.mk
+++ b/tmk_core/avr.mk
@@ -122,13 +122,14 @@ define EXEC_DFU
if [ "$(1)" ]; then \
$(DFU_PROGRAMMER) $(MCU) flash --force --eeprom $(QUANTUM_PATH)/split_common/$(1);\
fi; \
+ $(DFU_PROGRAMMER) $(MCU) flash --force $(BUILD_DIR)/$(TARGET).hex;\
else \
$(DFU_PROGRAMMER) $(MCU) erase; \
if [ "$(1)" ]; then \
$(DFU_PROGRAMMER) $(MCU) flash-eeprom $(QUANTUM_PATH)/split_common/$(1);\
fi; \
+ $(DFU_PROGRAMMER) $(MCU) flash $(BUILD_DIR)/$(TARGET).hex;\
fi; \
- $(DFU_PROGRAMMER) $(MCU) flash --force $(BUILD_DIR)/$(TARGET).hex;\
$(DFU_PROGRAMMER) $(MCU) reset
endef