diff options
| author | Ryan <fauxpark@gmail.com> | 2020-09-10 00:00:27 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-10 00:00:27 +1000 |
| commit | 6e948feb6a33bcd1da45c5a590d0e6c241e1d879 (patch) | |
| tree | 1e0e2effe14b47d700e23db27e4cf6769382ccb7 /tmk_core | |
| parent | 076b9d482f271bad14cb31c67aee6226b069e734 (diff) | |
| download | qmk_firmware-6e948feb6a33bcd1da45c5a590d0e6c241e1d879.tar.gz qmk_firmware-6e948feb6a33bcd1da45c5a590d0e6c241e1d879.zip | |
Use the force when flashing with dfu-programmer (#10070)
Diffstat (limited to 'tmk_core')
| -rw-r--r-- | tmk_core/avr.mk | 6 |
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 | |||
| 120 | if $(DFU_PROGRAMMER) --version 2>&1 | $(GREP) -q 0.7 ; then\ | 120 | if $(DFU_PROGRAMMER) --version 2>&1 | $(GREP) -q 0.7 ; then\ |
| 121 | $(DFU_PROGRAMMER) $(MCU) erase --force; \ | 121 | $(DFU_PROGRAMMER) $(MCU) erase --force; \ |
| 122 | if [ "$(1)" ]; then \ | 122 | if [ "$(1)" ]; then \ |
| 123 | $(DFU_PROGRAMMER) $(MCU) flash --eeprom $(QUANTUM_PATH)/split_common/$(1);\ | 123 | $(DFU_PROGRAMMER) $(MCU) flash --force --eeprom $(QUANTUM_PATH)/split_common/$(1);\ |
| 124 | fi; \ | 124 | fi; \ |
| 125 | else \ | 125 | else \ |
| 126 | $(DFU_PROGRAMMER) $(MCU) erase; \ | 126 | $(DFU_PROGRAMMER) $(MCU) erase; \ |
| @@ -128,7 +128,7 @@ define EXEC_DFU | |||
| 128 | $(DFU_PROGRAMMER) $(MCU) flash-eeprom $(QUANTUM_PATH)/split_common/$(1);\ | 128 | $(DFU_PROGRAMMER) $(MCU) flash-eeprom $(QUANTUM_PATH)/split_common/$(1);\ |
| 129 | fi; \ | 129 | fi; \ |
| 130 | fi; \ | 130 | fi; \ |
| 131 | $(DFU_PROGRAMMER) $(MCU) flash $(BUILD_DIR)/$(TARGET).hex;\ | 131 | $(DFU_PROGRAMMER) $(MCU) flash --force $(BUILD_DIR)/$(TARGET).hex;\ |
| 132 | $(DFU_PROGRAMMER) $(MCU) reset | 132 | $(DFU_PROGRAMMER) $(MCU) reset |
| 133 | endef | 133 | endef |
| 134 | 134 | ||
| @@ -141,7 +141,7 @@ dfu-start: | |||
| 141 | 141 | ||
| 142 | dfu-ee: $(BUILD_DIR)/$(TARGET).hex $(BUILD_DIR)/$(TARGET).eep | 142 | dfu-ee: $(BUILD_DIR)/$(TARGET).hex $(BUILD_DIR)/$(TARGET).eep |
| 143 | if $(DFU_PROGRAMMER) --version 2>&1 | $(GREP) -q 0.7 ; then\ | 143 | if $(DFU_PROGRAMMER) --version 2>&1 | $(GREP) -q 0.7 ; then\ |
| 144 | $(DFU_PROGRAMMER) $(MCU) flash --eeprom $(BUILD_DIR)/$(TARGET).eep;\ | 144 | $(DFU_PROGRAMMER) $(MCU) flash --force --eeprom $(BUILD_DIR)/$(TARGET).eep;\ |
| 145 | else\ | 145 | else\ |
| 146 | $(DFU_PROGRAMMER) $(MCU) flash-eeprom $(BUILD_DIR)/$(TARGET).eep;\ | 146 | $(DFU_PROGRAMMER) $(MCU) flash-eeprom $(BUILD_DIR)/$(TARGET).eep;\ |
| 147 | fi | 147 | fi |