diff options
| -rw-r--r-- | HISTORY.md | 3 | ||||
| -rw-r--r-- | arduino-mk/Arduino.mk | 8 |
2 files changed, 9 insertions, 2 deletions
@@ -3,6 +3,9 @@ A Makefile for Arduino Sketches The following is the rough list of changes that went into different versions. I tried to give credit whenever possible. If I have missed anyone, kindly add it to the list. +### 1.0.1 (2013-09-25) +- Unconditionally add -D in avrdude options. See #114 + ### 1.0.0 (2013-09-22) - Add $OBJDIR to the list of configuration that gets printed. Fix issue #77 - Add support for specifying optimization level. Fix issue #81 diff --git a/arduino-mk/Arduino.mk b/arduino-mk/Arduino.mk index c90d773..d71d6b6 100644 --- a/arduino-mk/Arduino.mk +++ b/arduino-mk/Arduino.mk @@ -959,9 +959,13 @@ ifndef AVRDUDE AVRDUDE = $(AVR_TOOLS_PATH)/avrdude endif -# Default avrdude options. -V Do not verify, -q - suppress progress output +# 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 + AVRDUDE_OPTS = -q -V -D endif AVRDUDE_COM_OPTS = $(AVRDUDE_OPTS) -p $(MCU) |