Nulo/qmk_firmware
1
0
Fork 0
Code Releases Activity

[fix] dfu-programmer <0.7 doesn't support --force flag (#10292)

Browse source 
Fixes <https://github.com/qmk/qmk_firmware/issues/10286>.
This commit is contained in:
Frans de Jonge 2020-09-13 03:17:47 +02:00 committed by GitHub
parent 9e99a9b98c
commit 2b9f200a2a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
tmk_core/avr.mk
View file

@ -122,13 +122,14 @@ define EXEC_DFU
if [ "$(1)" ]; then \ if [ "$(1)" ]; then \
$(DFU_PROGRAMMER) $(MCU) flash --force --eeprom $(QUANTUM_PATH)/split_common/$(1);\ $(DFU_PROGRAMMER) $(MCU) flash --force --eeprom $(QUANTUM_PATH)/split_common/$(1);\
fi; \ fi; \
$(DFU_PROGRAMMER) $(MCU) flash --force $(BUILD_DIR)/$(TARGET).hex;\
else \ else \
$(DFU_PROGRAMMER) $(MCU) erase; \ $(DFU_PROGRAMMER) $(MCU) erase; \
if [ "$(1)" ]; then \ if [ "$(1)" ]; then \
$(DFU_PROGRAMMER) $(MCU) flash-eeprom $(QUANTUM_PATH)/split_common/$(1);\ $(DFU_PROGRAMMER) $(MCU) flash-eeprom $(QUANTUM_PATH)/split_common/$(1);\
fi; \ fi; \
$(DFU_PROGRAMMER) $(MCU) flash $(BUILD_DIR)/$(TARGET).hex;\
fi; \ fi; \
$(DFU_PROGRAMMER) $(MCU) flash --force $(BUILD_DIR)/$(TARGET).hex;\
$(DFU_PROGRAMMER) $(MCU) reset $(DFU_PROGRAMMER) $(MCU) reset
endef endef