summaryrefslogtreecommitdiff
path: root/platforms
diff options
context:
space:
mode:
authorJoel Challis <git@zvecr.com>2023-03-02 23:26:37 +0000
committerGitHub <noreply@github.com>2023-03-03 10:26:37 +1100
commitbe781927c15b5452546a9132d30c3baaf101cef5 (patch)
tree726849cae93f24d01f100bc0f7cecb329b634ba0 /platforms
parent0a7f15964c6f8e10f7c1125cc61d31fc485ec25c (diff)
Merge upstream changes to uf2conv (#19993)
Diffstat (limited to 'platforms')
-rw-r--r--platforms/chibios/flash.mk10
1 files changed, 1 insertions, 9 deletions
diff --git a/platforms/chibios/flash.mk b/platforms/chibios/flash.mk
index ac842e8d62..525f177f9e 100644
--- a/platforms/chibios/flash.mk
+++ b/platforms/chibios/flash.mk
@@ -42,15 +42,7 @@ dfu-util: $(BUILD_DIR)/$(TARGET).bin cpfirmware sizeafter
$(call EXEC_DFU_UTIL)
define EXEC_UF2_UTIL_DEPLOY
- if ! $(UF2CONV) --deploy $(BUILD_DIR)/$(TARGET).uf2 2>/dev/null; then \
- printf "$(MSG_BOOTLOADER_NOT_FOUND_QUICK_RETRY)" ;\
- sleep $(BOOTLOADER_RETRY_TIME) ;\
- while ! $(UF2CONV) --deploy $(BUILD_DIR)/$(TARGET).uf2 2>/dev/null; do \
- printf "." ;\
- sleep $(BOOTLOADER_RETRY_TIME) ;\
- done ;\
- printf "\n" ;\
- fi
+ $(UF2CONV) --wait --deploy $(BUILD_DIR)/$(TARGET).uf2
endef
# TODO: Remove once ARM has a way to configure EECONFIG_HANDEDNESS