aboutsummaryrefslogtreecommitdiffstats
path: root/tmk_core
diff options
context:
space:
mode:
authorGravatar Ryan <fauxpark@gmail.com>2020-09-10 00:00:27 +1000
committerGravatar GitHub <noreply@github.com>2020-09-10 00:00:27 +1000
commit6e948feb6a33bcd1da45c5a590d0e6c241e1d879 (patch)
tree1e0e2effe14b47d700e23db27e4cf6769382ccb7 /tmk_core
parent076b9d482f271bad14cb31c67aee6226b069e734 (diff)
downloadqmk_firmware-6e948feb6a33bcd1da45c5a590d0e6c241e1d879.tar.gz
Use the force when flashing with dfu-programmer (#10070)
Diffstat (limited to 'tmk_core')
-rw-r--r--tmk_core/avr.mk6
1 files changed, 3 insertions, 3 deletions
diff --git a/tmk_core/avr.mk b/tmk_core/avr.mk
index 04ae16224..3cb34dc66 100644
--- a/tmk_core/avr.mk
+++ b/tmk_core/avr.mk
@@ -120,7 +120,7 @@ define EXEC_DFU
if $(DFU_PROGRAMMER) --version 2>&1 | $(GREP) -q 0.7 ; then\
$(DFU_PROGRAMMER) $(MCU) erase --force; \
if [ "$(1)" ]; then \
- $(DFU_PROGRAMMER) $(MCU) flash --eeprom $(QUANTUM_PATH)/split_common/$(1);\
+ $(DFU_PROGRAMMER) $(MCU) flash --force --eeprom $(QUANTUM_PATH)/split_common/$(1);\
fi; \
else \
$(DFU_PROGRAMMER) $(MCU) erase; \
@@ -128,7 +128,7 @@ define EXEC_DFU
$(DFU_PROGRAMMER) $(MCU) flash-eeprom $(QUANTUM_PATH)/split_common/$(1);\
fi; \
fi; \
- $(DFU_PROGRAMMER) $(MCU) flash $(BUILD_DIR)/$(TARGET).hex;\
+ $(DFU_PROGRAMMER) $(MCU) flash --force $(BUILD_DIR)/$(TARGET).hex;\
$(DFU_PROGRAMMER) $(MCU) reset
endef
@@ -141,7 +141,7 @@ dfu-start:
dfu-ee: $(BUILD_DIR)/$(TARGET).hex $(BUILD_DIR)/$(TARGET).eep
if $(DFU_PROGRAMMER) --version 2>&1 | $(GREP) -q 0.7 ; then\
- $(DFU_PROGRAMMER) $(MCU) flash --eeprom $(BUILD_DIR)/$(TARGET).eep;\
+ $(DFU_PROGRAMMER) $(MCU) flash --force --eeprom $(BUILD_DIR)/$(TARGET).eep;\
else\
$(DFU_PROGRAMMER) $(MCU) flash-eeprom $(BUILD_DIR)/$(TARGET).eep;\
fi