diff options
| author | Joel Challis <git@zvecr.com> | 2020-04-01 13:27:16 +0100 |
|---|---|---|
| committer | Florian Didron <fdidron@users.noreply.github.com> | 2020-06-12 17:00:27 +0900 |
| commit | 09aa3b15f4069578c4d4a43c12598caea7b7e366 (patch) | |
| tree | 7d0983006baa999258b0e304d16d73fa23441789 /tmk_core/chibios.mk | |
| parent | 626da49ee04a67dd96299a0310b708893fe93b2c (diff) | |
Migrate :program logic to :flash (#8631)
Diffstat (limited to 'tmk_core/chibios.mk')
| -rw-r--r-- | tmk_core/chibios.mk | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tmk_core/chibios.mk b/tmk_core/chibios.mk index 24a9bcf860..d0f1032acb 100644 --- a/tmk_core/chibios.mk +++ b/tmk_core/chibios.mk @@ -326,7 +326,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) |