diff options
| author | Jan Gosmann <jan@hyper-world.de> | 2012-11-02 12:51:53 +0100 |
|---|---|---|
| committer | Jan Gosmann <jan@hyper-world.de> | 2012-11-02 12:51:53 +0100 |
| commit | 90e3c9ad0bb75d87e19d9eb017024aed55b544d1 (patch) | |
| tree | 02c3301859e27a09c3bf6d263c61aa187c755cd5 /arduino-mk | |
| parent | bc8caf8358dfb1c87bcbdef107fe5a7d74b37c4a (diff) | |
Fix upload in case of parallelized make.
Diffstat (limited to 'arduino-mk')
| -rw-r--r-- | arduino-mk/Arduino.mk | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arduino-mk/Arduino.mk b/arduino-mk/Arduino.mk index 84d6573..b47a025 100644 --- a/arduino-mk/Arduino.mk +++ b/arduino-mk/Arduino.mk @@ -840,16 +840,14 @@ $(CORE_LIB): $(CORE_OBJS) $(LIB_OBJS) $(USER_LIB_OBJS) $(DEP_FILE): $(OBJDIR) $(DEPS) 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) \ -U flash:w:$(TARGET_HEX):i reset: $(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 # stdin/out appears to work but generates a spurious error on MacOS at |