summaryrefslogtreecommitdiff
path: root/tmk_core
diff options
context:
space:
mode:
authorFrans de Jonge <fransdejonge@gmail.com>2020-09-13 03:17:47 +0200
committerGitHub <noreply@github.com>2020-09-13 02:17:47 +0100
commit2b9f200a2a0f0430e80df75b8a4d5757e6ca0374 (patch)
treed12704bde56e634d4290aae16b0416896f696eca /tmk_core
parent9e99a9b98c2e57ce5a4ada41446e8555bc05b1ad (diff)
[fix] dfu-programmer <0.7 doesn't support --force flag (#10292)
Fixes <https://github.com/qmk/qmk_firmware/issues/10286>.
Diffstat (limited to 'tmk_core')
-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 3cb34dc665..336a83e9d3 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