diff options
| author | Frans de Jonge <fransdejonge@gmail.com> | 2020-09-13 03:17:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-13 02:17:47 +0100 |
| commit | 2b9f200a2a0f0430e80df75b8a4d5757e6ca0374 (patch) | |
| tree | d12704bde56e634d4290aae16b0416896f696eca /tmk_core | |
| parent | 9e99a9b98c2e57ce5a4ada41446e8555bc05b1ad (diff) | |
| download | qmk_firmware-2b9f200a2a0f0430e80df75b8a4d5757e6ca0374.tar.gz qmk_firmware-2b9f200a2a0f0430e80df75b8a4d5757e6ca0374.zip | |
[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.mk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tmk_core/avr.mk b/tmk_core/avr.mk index 3cb34dc66..336a83e9d 100644 --- a/tmk_core/avr.mk +++ b/tmk_core/avr.mk | |||
| @@ -122,13 +122,14 @@ define EXEC_DFU | |||
| 122 | if [ "$(1)" ]; then \ | 122 | if [ "$(1)" ]; then \ |
| 123 | $(DFU_PROGRAMMER) $(MCU) flash --force --eeprom $(QUANTUM_PATH)/split_common/$(1);\ | 123 | $(DFU_PROGRAMMER) $(MCU) flash --force --eeprom $(QUANTUM_PATH)/split_common/$(1);\ |
| 124 | fi; \ | 124 | fi; \ |
| 125 | $(DFU_PROGRAMMER) $(MCU) flash --force $(BUILD_DIR)/$(TARGET).hex;\ | ||
| 125 | else \ | 126 | else \ |
| 126 | $(DFU_PROGRAMMER) $(MCU) erase; \ | 127 | $(DFU_PROGRAMMER) $(MCU) erase; \ |
| 127 | if [ "$(1)" ]; then \ | 128 | if [ "$(1)" ]; then \ |
| 128 | $(DFU_PROGRAMMER) $(MCU) flash-eeprom $(QUANTUM_PATH)/split_common/$(1);\ | 129 | $(DFU_PROGRAMMER) $(MCU) flash-eeprom $(QUANTUM_PATH)/split_common/$(1);\ |
| 129 | fi; \ | 130 | fi; \ |
| 131 | $(DFU_PROGRAMMER) $(MCU) flash $(BUILD_DIR)/$(TARGET).hex;\ | ||
| 130 | fi; \ | 132 | fi; \ |
| 131 | $(DFU_PROGRAMMER) $(MCU) flash --force $(BUILD_DIR)/$(TARGET).hex;\ | ||
| 132 | $(DFU_PROGRAMMER) $(MCU) reset | 133 | $(DFU_PROGRAMMER) $(MCU) reset |
| 133 | endef | 134 | endef |
| 134 | 135 | ||
