From 0f6848750108cda0062ece0df0ba4abca9af55b6 Mon Sep 17 00:00:00 2001
From: Sudar <sudar@sudarmuthu.com>
Date: Wed, 25 Sep 2013 15:18:14 +0530
Subject: Unconditionally add `-D` in avrdude options.

This is needed in Mega boards, because of a bug in Mega bootloader. See
https://github.com/sudar/Arduino-Makefile/issues/114#issuecomment-25011005
for detailed explanation.

Fix #114
---
 arduino-mk/Arduino.mk | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'arduino-mk')

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)
-- 
cgit v1.2.3