diff options
| author | QMK Bot <hello@qmk.fm> | 2021-01-03 20:30:50 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2021-01-03 20:30:50 +0000 |
| commit | 1f8acb7619637035fc626e4ef15e96330486158a (patch) | |
| tree | 4b1fb650ed0e6663a4fac5e3967de588953434ea /tmk_core | |
| parent | 271c0cf136c5dd5b9456d8b79272e67bc1a13cea (diff) | |
| parent | 070240f2123f91c51a3cb146d601cf5b61beebfe (diff) | |
| download | qmk_firmware-1f8acb7619637035fc626e4ef15e96330486158a.tar.gz qmk_firmware-1f8acb7619637035fc626e4ef15e96330486158a.zip | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'tmk_core')
| -rw-r--r-- | tmk_core/arm_atsam.mk | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tmk_core/arm_atsam.mk b/tmk_core/arm_atsam.mk index 403ebf3a8..e4bf60e1a 100644 --- a/tmk_core/arm_atsam.mk +++ b/tmk_core/arm_atsam.mk | |||
| @@ -56,4 +56,8 @@ bin: $(BUILD_DIR)/$(TARGET).hex | |||
| 56 | $(COPY) $(BUILD_DIR)/$(TARGET).bin $(TARGET).bin; | 56 | $(COPY) $(BUILD_DIR)/$(TARGET).bin $(TARGET).bin; |
| 57 | 57 | ||
| 58 | flash: bin | 58 | flash: bin |
| 59 | ifneq ($(strip $(PROGRAM_CMD)),) | ||
| 60 | $(PROGRAM_CMD) | ||
| 61 | else | ||
| 59 | $(PRINT_OK); $(SILENT) || printf "$(MSG_FLASH_ARCH)" | 62 | $(PRINT_OK); $(SILENT) || printf "$(MSG_FLASH_ARCH)" |
| 63 | endif | ||