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

Update Arduino.mk

Browse source 
Update the mcu decoupling to enable local overrides. Update the -D code to only turn it off for attiny84.
This commit is contained in:
hhgarnes 2015-06-01 20:30:03 +02:00
parent f2906a1bd4
commit ea8008927b
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Arduino.mk
View file

@ -1284,20 +1284,22 @@ endif
# Decouple the mcu between the compiler options (-mmcu) and the avrdude options (-p).
# This is needed to be able to compile for attiny84a but specify the upload mcu as attiny84.
ifeq ($(MCU), attiny84a)
AVRDUDE_MCU = attiny84
else
# We default to picking the -mmcu flag, but you can override this by setting
# AVRDUDE_MCU in your makefile.
ifndef AVRDUDE_MCU
AVRDUDE_MCU = $(MCU)
endif
# -D - Disable auto erase for flash memory
# -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)
ifneq ($(AVRDUDE_MCU), attiny84)
AVRDUDE_OPTS += -D
# -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) -p $(AVRDUDE_MCU)
AVRDUDE_COM_OPTS = $(AVRDUDE_OPTS) $(AVRDUDE_ERASE_FLASH_OPT) -p $(AVRDUDE_MCU)
ifdef AVRDUDE_CONF
AVRDUDE_COM_OPTS += -C $(AVRDUDE_CONF)
endif