lunny/qmk_firmware-mirror
1
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware synced 2025-01-03 13:40:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into develop

Browse Source
This commit is contained in:
QMK Bot
2021-01-03 20:30:50 +00:00
parent 271c0cf136 070240f212
commit 1f8acb7619
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tmk_core/arm_atsam.mk
View File

@ -56,4 +56,8 @@ bin: $(BUILD_DIR)/$(TARGET).hex
$(COPY) $(BUILD_DIR)/$(TARGET).bin $(TARGET).bin; $(COPY) $(BUILD_DIR)/$(TARGET).bin $(TARGET).bin;
flash: bin flash: bin
ifneq ($(strip $(PROGRAM_CMD)),)
$(PROGRAM_CMD)
else
$(PRINT_OK); $(SILENT) || printf "$(MSG_FLASH_ARCH)" $(PRINT_OK); $(SILENT) || printf "$(MSG_FLASH_ARCH)"
endif