diff options
| author | Sudar <sudar@sudarmuthu.com> | 2014-11-08 12:50:12 +0530 |
|---|---|---|
| committer | Sudar <sudar@sudarmuthu.com> | 2014-11-08 12:50:12 +0530 |
| commit | 5d7bc158d3fadd8d40c62d5d8071ff9386e24bd6 (patch) | |
| tree | c9aed8fdde4cd0be6fd88074c4ead096d23ea163 /Arduino.mk | |
| parent | fe5c2b6ce13b9b63548d7e39a75ebfb92fbd854c (diff) | |
| parent | 05b57c3cc3160e3c66dea7b88e707e9327b96bf4 (diff) | |
Merge pull request #288 from tchebb/fix-ispload-erase
Allow avrdude to erase the chip before programming during ispload
Diffstat (limited to 'Arduino.mk')
| -rw-r--r-- | Arduino.mk | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -1209,10 +1209,8 @@ endif # Default avrdude options # -V Do not verify # -q - suppress progress output -# -D - Disable auto erase for flash memory -# (-D is needed for Mega boards. See https://github.com/sudar/Arduino-Makefile/issues/114#issuecomment-25011005) ifndef AVRDUDE_OPTS - AVRDUDE_OPTS = -q -V -D + AVRDUDE_OPTS = -q -V endif AVRDUDE_COM_OPTS = $(AVRDUDE_OPTS) -p $(MCU) @@ -1220,7 +1218,9 @@ ifdef AVRDUDE_CONF AVRDUDE_COM_OPTS += -C $(AVRDUDE_CONF) endif -AVRDUDE_ARD_OPTS = -c $(AVRDUDE_ARD_PROGRAMMER) -b $(AVRDUDE_ARD_BAUDRATE) -P +# -D - Disable auto erase for flash memory +# (-D is needed for Mega boards. See https://github.com/sudar/Arduino-Makefile/issues/114#issuecomment-25011005) +AVRDUDE_ARD_OPTS = -D -c $(AVRDUDE_ARD_PROGRAMMER) -b $(AVRDUDE_ARD_BAUDRATE) -P ifeq ($(CURRENT_OS), WINDOWS) # get_monitor_port checks to see if the monitor port exists, assuming it is # a file. In Windows, avrdude needs the port in the format 'com1' which is |