summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2021-01-03 20:30:50 +0000
committerQMK Bot <hello@qmk.fm>2021-01-03 20:30:50 +0000
commit1f8acb7619637035fc626e4ef15e96330486158a (patch)
tree4b1fb650ed0e6663a4fac5e3967de588953434ea
parent271c0cf136c5dd5b9456d8b79272e67bc1a13cea (diff)
parent070240f2123f91c51a3cb146d601cf5b61beebfe (diff)
Merge remote-tracking branch 'origin/master' into develop
-rw-r--r--tmk_core/arm_atsam.mk4
1 files changed, 4 insertions, 0 deletions
diff --git a/tmk_core/arm_atsam.mk b/tmk_core/arm_atsam.mk
index 403ebf3a89..e4bf60e1af 100644
--- a/tmk_core/arm_atsam.mk
+++ b/tmk_core/arm_atsam.mk
@@ -56,4 +56,8 @@ bin: $(BUILD_DIR)/$(TARGET).hex
$(COPY) $(BUILD_DIR)/$(TARGET).bin $(TARGET).bin;
flash: bin
+ifneq ($(strip $(PROGRAM_CMD)),)
+ $(PROGRAM_CMD)
+else
$(PRINT_OK); $(SILENT) || printf "$(MSG_FLASH_ARCH)"
+endif