Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
1f8acb7619
|
@ -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
|
||||||
|
|
Loading…
Reference in New Issue