From be781927c15b5452546a9132d30c3baaf101cef5 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Thu, 2 Mar 2023 23:26:37 +0000
Subject: Merge upstream changes to uf2conv (#19993)

---
 platforms/chibios/flash.mk | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

(limited to 'platforms')

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
-- 
cgit v1.2.3