From b6a09502c626c3a94a859ab0a61d41a41835d611 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Wed, 1 Apr 2020 13:27:16 +0100 Subject: Migrate :program logic to :flash (#8631) --- tmk_core/chibios.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'tmk_core/chibios.mk') diff --git a/tmk_core/chibios.mk b/tmk_core/chibios.mk index f3b4b399cc..6bacabbbf3 100644 --- a/tmk_core/chibios.mk +++ b/tmk_core/chibios.mk @@ -327,7 +327,9 @@ bin: $(BUILD_DIR)/$(TARGET).bin sizeafter flash: $(BUILD_DIR)/$(TARGET).bin cpfirmware sizeafter -ifeq ($(strip $(BOOTLOADER)),dfu) +ifneq ($(strip $(PROGRAM_CMD)),) + $(PROGRAM_CMD) +else ifeq ($(strip $(BOOTLOADER)),dfu) $(call EXEC_DFU_UTIL) else ifeq ($(strip $(MCU_FAMILY)),KINETIS) $(call EXEC_TEENSY) -- cgit v1.2.3