dominic/Arduino-Makefile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix upload in case of parallelized make.

Browse source
This commit is contained in:
Jan Gosmann 2012-11-02 12:51:53 +01:00
parent bc8caf8358
commit 90e3c9ad0b
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
arduino-mk/Arduino.mk
View file

@ -840,16 +840,14 @@ $(CORE_LIB): $(CORE_OBJS) $(LIB_OBJS) $(USER_LIB_OBJS)
$(DEP_FILE): $(OBJDIR) $(DEPS) $(DEP_FILE): $(OBJDIR) $(DEPS)
cat $(DEPS) > $(DEP_FILE) cat $(DEPS) > $(DEP_FILE)
upload: reset raw_upload upload: raw_upload
raw_upload: $(TARGET_HEX) raw_upload: reset $(TARGET_HEX)
$(AVRDUDE) $(AVRDUDE_COM_OPTS) $(AVRDUDE_ARD_OPTS) \ $(AVRDUDE) $(AVRDUDE_COM_OPTS) $(AVRDUDE_ARD_OPTS) \
-U flash:w:$(TARGET_HEX):i -U flash:w:$(TARGET_HEX):i
reset: reset:
$(RESET_CMD) $(ARD_PORT) $(RESET_CMD) $(ARD_PORT)
sleep 1 # If avrdude is called to early after the reset, the upload may
# hang.
# stty on MacOS likes -F, but on Debian it likes -f redirecting # stty on MacOS likes -F, but on Debian it likes -f redirecting
# stdin/out appears to work but generates a spurious error on MacOS at # stdin/out appears to work but generates a spurious error on MacOS at