aboutsummaryrefslogtreecommitdiff
path: root/tmk_core
diff options
context:
space:
mode:
authorDrashna Jaelre <drashna@live.com>2019-05-03 08:24:22 -0700
committerMechMerlin <30334081+mechmerlin@users.noreply.github.com>2019-05-03 08:24:22 -0700
commit41beecfc1847bd0039c508753a212fa18f207e3f (patch)
tree48569d636367b6f1ec50d7010ebf47315f4412d8 /tmk_core
parent29f68459a01c155ca64aed4ec0ba083d0dee0d2e (diff)
downloadqmk_firmware-41beecfc1847bd0039c508753a212fa18f207e3f.tar.gz
qmk_firmware-41beecfc1847bd0039c508753a212fa18f207e3f.zip
Add DFU Suffix for ARM boards (#5763)
* Add DFU Suffix for ARM boards * Blindly flash DFU SUFFIX ARGS for now * Fix commented out check * Fix DFU Suffix Argument check Thank you jack! * Update Travis CI Scripts to include dfu-util So we can get dfu-suffix as well * Manually add dfu-suffix package * Use external repo for newer version of dfu-util One that includes dfu-suffix * Update .travis.yml * Silence unnecessary output from dfu-suffix
Diffstat (limited to 'tmk_core')
-rw-r--r--tmk_core/chibios.mk5
1 files changed, 5 insertions, 0 deletions
diff --git a/tmk_core/chibios.mk b/tmk_core/chibios.mk
index 01edebfd7..44c00bdd1 100644
--- a/tmk_core/chibios.mk
+++ b/tmk_core/chibios.mk
@@ -201,6 +201,7 @@ DFU_ARGS ?=
201ifneq ("$(SERIAL)","") 201ifneq ("$(SERIAL)","")
202 DFU_ARGS += -S $(SERIAL) 202 DFU_ARGS += -S $(SERIAL)
203endif 203endif
204DFU_SUFFIX_ARGS ?=
204 205
205ST_LINK_ARGS ?= 206ST_LINK_ARGS ?=
206 207
@@ -208,6 +209,7 @@ ST_LINK_ARGS ?=
208EXTRALIBDIRS = $(RULESPATH)/ld 209EXTRALIBDIRS = $(RULESPATH)/ld
209 210
210DFU_UTIL ?= dfu-util 211DFU_UTIL ?= dfu-util
212DFU_SUFFIX ?= dfu-suffix
211ST_LINK_CLI ?= st-link_cli 213ST_LINK_CLI ?= st-link_cli
212 214
213# Generate a .qmk for the QMK-FF 215# Generate a .qmk for the QMK-FF
@@ -259,4 +261,7 @@ st-link-cli: $(BUILD_DIR)/$(TARGET).hex sizeafter
259 $(ST_LINK_CLI) $(ST_LINK_ARGS) -q -c SWD -p $(BUILD_DIR)/$(TARGET).hex -Rst 261 $(ST_LINK_CLI) $(ST_LINK_ARGS) -q -c SWD -p $(BUILD_DIR)/$(TARGET).hex -Rst
260 262
261bin: $(BUILD_DIR)/$(TARGET).bin sizeafter 263bin: $(BUILD_DIR)/$(TARGET).bin sizeafter
264 if [ ! -z "$(DFU_SUFFIX_ARGS)" ]; then \
265 $(DFU_SUFFIX) $(DFU_SUFFIX_ARGS) -a $(BUILD_DIR)/$(TARGET).bin 1>/dev/null ;\
266 fi
262 $(COPY) $(BUILD_DIR)/$(TARGET).bin $(TARGET).bin; 267 $(COPY) $(BUILD_DIR)/$(TARGET).bin $(TARGET).bin;