diff options
| author | Sudar <sudar@sudarmuthu.com> | 2012-11-10 21:41:49 -0800 |
|---|---|---|
| committer | Sudar <sudar@sudarmuthu.com> | 2012-11-10 21:41:49 -0800 |
| commit | bb172d1c42ba4c4f174f8eb32d222a19d6cc9781 (patch) | |
| tree | 02c3301859e27a09c3bf6d263c61aa187c755cd5 /arduino-mk/Arduino.mk | |
| parent | 99890b253540f3ea0f2706ed4c3a7b1f15549bdc (diff) | |
| parent | 90e3c9ad0bb75d87e19d9eb017024aed55b544d1 (diff) | |
Merge pull request #8 from jgosmann/master
Fixing hanging uploads
Diffstat (limited to 'arduino-mk/Arduino.mk')
| -rw-r--r-- | arduino-mk/Arduino.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arduino-mk/Arduino.mk b/arduino-mk/Arduino.mk index 8fc8e5c..b47a025 100644 --- a/arduino-mk/Arduino.mk +++ b/arduino-mk/Arduino.mk @@ -840,9 +840,9 @@ $(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 |