drashna/qmk_firmware
1
0
Fork 0
Code Activity Actions

Merge upstream changes to uf2conv (#19993)

Browse source
This commit is contained in:
Joel Challis 2023-03-02 23:26:37 +00:00 • committed by GitHub
parent 0a7f15964c
commit be781927c1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 46 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

10
platforms/chibios/flash.mk
View file

@ -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