diff options
| author | Joel Challis <git@zvecr.com> | 2020-04-01 13:27:16 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-01 13:27:16 +0100 |
| commit | b6a09502c626c3a94a859ab0a61d41a41835d611 (patch) | |
| tree | cd4d558c3b5f70b541c57b2b9c174f7a34faebd3 /tmk_core/chibios.mk | |
| parent | 19621354189066417c42ac840dfc237bf790f09b (diff) | |
| download | firmware-b6a09502c626c3a94a859ab0a61d41a41835d611.tar.gz firmware-b6a09502c626c3a94a859ab0a61d41a41835d611.tar.bz2 firmware-b6a09502c626c3a94a859ab0a61d41a41835d611.zip | |
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 f3b4b399c..6bacabbbf 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) |