summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Challis <git@zvecr.com>2019-08-23 00:08:45 +0100
committerDrashna Jaelre <drashna@live.com>2019-08-22 16:08:45 -0700
commitae44ec9820cdf5348e802c9bae3af34557617685 (patch)
tree1c0e98156fa2df209290f295ff000264a1852df1
parent1c805b3d008a98a5a15112b0655ba14b42dbae67 (diff)
Align flashing behaviour of dfu-util (#6578)
* Align flashing retry logic of dfu-util * Align bootloader wait messages Co-Authored-By: Drashna Jaelre <drashna@live.com>
-rw-r--r--docs/flashing.md6
-rw-r--r--tmk_core/chibios.mk22
2 files changed, 8 insertions, 20 deletions
diff --git a/docs/flashing.md b/docs/flashing.md
index 833b9dd629..d11dbdf15b 100644
--- a/docs/flashing.md
+++ b/docs/flashing.md
@@ -171,7 +171,5 @@ Flashing sequence:
There are a number of DFU commands that you can use to flash firmware to a STM32 device:
-* `:dfu-util` - The default command for flashing to STM32 devices.
-* `:dfu-util-wait` - This works like the default command, but it gives you a (configurable) 10 second timeout before it attempts to flash the firmware. You can use `TIME_DELAY=20` from the command line to change the timeout.
- * Eg: `make <keyboard>:<keymap>:dfu-util TIME_DELAY=5`
-* `:st-link-cli` - This allows you to flash the firmware via ST-LINK's CLI utility, rather than dfu-util.
+* `:dfu-util` - The default command for flashing to STM32 devices.
+* `:st-link-cli` - This allows you to flash the firmware via ST-LINK's CLI utility, rather than dfu-util.
diff --git a/tmk_core/chibios.mk b/tmk_core/chibios.mk
index eee520467d..4b5b6d00b5 100644
--- a/tmk_core/chibios.mk
+++ b/tmk_core/chibios.mk
@@ -235,28 +235,18 @@ qmk: $(BUILD_DIR)/$(TARGET).bin
printf "@ $(TARGET).json\n@=info.json\n" | zipnote -w $(TARGET).qmk
define EXEC_DFU_UTIL
+ until $(DFU_UTIL) -l | grep -q "Found DFU"; do\
+ echo "Error: Bootloader not found. Trying again in 5s." ;\
+ sleep 5 ;\
+ done
$(DFU_UTIL) $(DFU_ARGS) -D $(BUILD_DIR)/$(TARGET).bin
endef
dfu-util: $(BUILD_DIR)/$(TARGET).bin cpfirmware sizeafter
$(call EXEC_DFU_UTIL)
-ifneq ($(strip $(TIME_DELAY)),)
- TIME_DELAY = $(strip $(TIME_DELAY))
-else
- TIME_DELAY = 10
-endif
-dfu-util-wait: $(BUILD_DIR)/$(TARGET).bin cpfirmware sizeafter
- echo "Preparing to flash firmware. Please enter bootloader now..." ;\
- COUNTDOWN=$(TIME_DELAY) ;\
- while [[ $$COUNTDOWN -ge 1 ]] ; do \
- echo "Flashing in $$COUNTDOWN ..."; \
- sleep 1 ;\
- ((COUNTDOWN = COUNTDOWN - 1)) ; \
- done; \
- echo "Flashing $(TARGET).bin" ;\
- sleep 1 ;\
- $(call EXEC_DFU_UTIL)
+# Legacy alias
+dfu-util-wait: dfu-util
st-link-cli: $(BUILD_DIR)/$(TARGET).hex sizeafter
$(ST_LINK_CLI) $(ST_LINK_ARGS) -q -c SWD -p $(BUILD_DIR)/$(TARGET).hex -Rst