From 2b9f200a2a0f0430e80df75b8a4d5757e6ca0374 Mon Sep 17 00:00:00 2001
From: Frans de Jonge <fransdejonge@gmail.com>
Date: Sun, 13 Sep 2020 03:17:47 +0200
Subject: [PATCH] [fix] dfu-programmer <0.7 doesn't support --force flag
 (#10292)

Fixes <https://github.com/qmk/qmk_firmware/issues/10286>.
---
 tmk_core/avr.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tmk_core/avr.mk b/tmk_core/avr.mk
index 3cb34dc66..336a83e9d 100644
--- a/tmk_core/avr.mk
+++ b/tmk_core/avr.mk
@@ -122,13 +122,14 @@ define EXEC_DFU
 		if [ "$(1)" ]; then \
 			$(DFU_PROGRAMMER) $(MCU) flash --force --eeprom $(QUANTUM_PATH)/split_common/$(1);\
 		fi; \
+		$(DFU_PROGRAMMER) $(MCU) flash --force $(BUILD_DIR)/$(TARGET).hex;\
 	else \
 		$(DFU_PROGRAMMER) $(MCU) erase; \
 		if [ "$(1)" ]; then \
 			$(DFU_PROGRAMMER) $(MCU) flash-eeprom $(QUANTUM_PATH)/split_common/$(1);\
 		fi; \
+		$(DFU_PROGRAMMER) $(MCU) flash $(BUILD_DIR)/$(TARGET).hex;\
 	fi; \
-	$(DFU_PROGRAMMER) $(MCU) flash --force $(BUILD_DIR)/$(TARGET).hex;\
 	$(DFU_PROGRAMMER) $(MCU) reset
 endef