aboutsummaryrefslogtreecommitdiff
path: root/Arduino.mk
diff options
context:
space:
mode:
authorSudar Muthu <sudar@sudarmuthu.com>2019-06-19 09:05:02 +0530
committerGitHub <noreply@github.com>2019-06-19 09:05:02 +0530
commit3f1ef10d40ca30ffc4c75402723af82b4d080536 (patch)
tree84a06c2f5b3cd28c0cf1db240fcc5892623e9e83 /Arduino.mk
parentcf5d016746c82e72c501ee10dfd55be6bf937d83 (diff)
parentec1947a7cda724b4de7783a1f74abf31ae59e955 (diff)
Merge pull request #586 from SearchAThing-forks/master
allow to enable AVRDUDE_AUTOERASE_FLASH
Diffstat (limited to 'Arduino.mk')
-rw-r--r--Arduino.mk6
1 files changed, 5 insertions, 1 deletions
diff --git a/Arduino.mk b/Arduino.mk
index d9ed05b..515f590 100644
--- a/Arduino.mk
+++ b/Arduino.mk
@@ -1542,7 +1542,11 @@ endif
# -D - Disable auto erase for flash memory
# Note: -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 ($(AVRDUDE_AUTOERASE_FLASH), yes)
+else
+ AVRDUDE_ARD_OPTS = -D
+endif
+AVRDUDE_ARD_OPTS += -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