diff options
author | skullydazed <skullydazed@users.noreply.github.com> | 2019-07-07 09:08:49 -0700 |
---|---|---|
committer | MechMerlin <30334081+mechmerlin@users.noreply.github.com> | 2019-07-07 09:08:49 -0700 |
commit | 75795186135e6d83de1ff3bb108f9c5471742ba4 (patch) | |
tree | 053c8a44a69d0ff3b7fdf49e0898f455bc518aca /tmk_core/chibios.mk | |
parent | d16db6936715a98b6ae769463d5ccafab25b7203 (diff) | |
download | qmk_firmware-75795186135e6d83de1ff3bb108f9c5471742ba4.tar.gz qmk_firmware-75795186135e6d83de1ff3bb108f9c5471742ba4.zip |
Fix chibios so the dfu-suffix is only applied once. (#6270)
Diffstat (limited to 'tmk_core/chibios.mk')
-rw-r--r-- | tmk_core/chibios.mk | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/tmk_core/chibios.mk b/tmk_core/chibios.mk index 11715cf34..4aebb4776 100644 --- a/tmk_core/chibios.mk +++ b/tmk_core/chibios.mk | |||
@@ -201,7 +201,6 @@ DFU_ARGS ?= | |||
201 | ifneq ("$(SERIAL)","") | 201 | ifneq ("$(SERIAL)","") |
202 | DFU_ARGS += -S $(SERIAL) | 202 | DFU_ARGS += -S $(SERIAL) |
203 | endif | 203 | endif |
204 | DFU_SUFFIX_ARGS ?= | ||
205 | 204 | ||
206 | ST_LINK_ARGS ?= | 205 | ST_LINK_ARGS ?= |
207 | 206 | ||
@@ -209,7 +208,6 @@ ST_LINK_ARGS ?= | |||
209 | EXTRALIBDIRS = $(RULESPATH)/ld | 208 | EXTRALIBDIRS = $(RULESPATH)/ld |
210 | 209 | ||
211 | DFU_UTIL ?= dfu-util | 210 | DFU_UTIL ?= dfu-util |
212 | DFU_SUFFIX ?= dfu-suffix | ||
213 | ST_LINK_CLI ?= st-link_cli | 211 | ST_LINK_CLI ?= st-link_cli |
214 | 212 | ||
215 | # Generate a .qmk for the QMK-FF | 213 | # Generate a .qmk for the QMK-FF |
@@ -274,7 +272,3 @@ teensy: $(BUILD_DIR)/$(TARGET).hex cpfirmware sizeafter | |||
274 | $(TEENSY_LOADER_CLI) -mmcu=$(MCU_LDSCRIPT) -w -v $(BUILD_DIR)/$(TARGET).hex | 272 | $(TEENSY_LOADER_CLI) -mmcu=$(MCU_LDSCRIPT) -w -v $(BUILD_DIR)/$(TARGET).hex |
275 | 273 | ||
276 | bin: $(BUILD_DIR)/$(TARGET).bin sizeafter | 274 | bin: $(BUILD_DIR)/$(TARGET).bin sizeafter |
277 | if [ ! -z "$(DFU_SUFFIX_ARGS)" ]; then \ | ||
278 | $(DFU_SUFFIX) $(DFU_SUFFIX_ARGS) -a $(BUILD_DIR)/$(TARGET).bin 1>/dev/null ;\ | ||
279 | fi | ||
280 | $(COPY) $(BUILD_DIR)/$(TARGET).bin $(TARGET).bin; | ||