dominic/Arduino-Makefile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update Arduino.mk

Browse source 
Remove everything that has to do with -D, because it's not used for ispload.
This commit is contained in:
hhgarnes 2015-06-01 23:25:41 +02:00
parent ea8008927b
commit 5c0d77528b
1 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Arduino.mk
View file

@ -1290,21 +1290,14 @@ ifndef AVRDUDE_MCU
AVRDUDE_MCU = $(MCU) AVRDUDE_MCU = $(MCU)
endif endif
# -D - Disable auto erase for flash memory AVRDUDE_COM_OPTS = $(AVRDUDE_OPTS) -p $(AVRDUDE_MCU)
# -D is needed for Mega boards. (See https://github.com/sudar/Arduino-Makefile/issues/114#issuecomment-25011005)
# -D must NOT be present for attiny84a (unknown for attiny84)
ifeq ($(AVRDUDE_MCU), attiny84)
AVRDUDE_ERASE_FLASH_OPT =
else
AVRDUDE_ERASE_FLASH_OPT = -D
endif
AVRDUDE_COM_OPTS = $(AVRDUDE_OPTS) $(AVRDUDE_ERASE_FLASH_OPT) -p $(AVRDUDE_MCU)
ifdef AVRDUDE_CONF ifdef AVRDUDE_CONF
AVRDUDE_COM_OPTS += -C $(AVRDUDE_CONF) AVRDUDE_COM_OPTS += -C $(AVRDUDE_CONF)
endif 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) ifeq ($(CURRENT_OS), WINDOWS)
# get_monitor_port checks to see if the monitor port exists, assuming it is # 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 # a file. In Windows, avrdude needs the port in the format 'com1' which is
@ -1368,6 +1361,7 @@ ifndef AVRDUDE_ISP_FUSES_POST
endif endif
endif endif
# -D may cause issues with some boards like attiny84a.
AVRDUDE_ISP_OPTS = -c $(ISP_PROG) -b $(AVRDUDE_ISP_BAUDRATE) AVRDUDE_ISP_OPTS = -c $(ISP_PROG) -b $(AVRDUDE_ISP_BAUDRATE)
ifndef $(ISP_PORT) ifndef $(ISP_PORT)