aboutsummaryrefslogtreecommitdiff
path: root/Arduino.mk
diff options
context:
space:
mode:
authorSimon John <git@the-jedi.co.uk>2015-12-28 10:05:53 +0000
committerSimon John <git@the-jedi.co.uk>2015-12-28 10:05:53 +0000
commitc67f505a710c594c36974d23b3223a95aabd9c8f (patch)
tree025d14ef30ed3ff6c552c7c3da25319702fbe51e /Arduino.mk
parent7e6a3e252b52adc4e949bc3421958ba8ca4ab053 (diff)
Removed the check for BOOTLOADER_PATH being empty as its merged into
BOOTLOADER_FILE in 1.5+ Now we just check for BOOTLOADER_FILE being non-empty on both versions. Fixes issue #402
Diffstat (limited to 'Arduino.mk')
-rw-r--r--Arduino.mk6
1 files changed, 2 insertions, 4 deletions
diff --git a/Arduino.mk b/Arduino.mk
index 1ba6c6e..ab7ecd9 100644
--- a/Arduino.mk
+++ b/Arduino.mk
@@ -1358,10 +1358,8 @@ endif
# Bootloader file settings
ifndef AVRDUDE_ISP_BURN_BOOTLOADER
- ifneq ($(strip $(BOOTLOADER_PATH)),)
- ifneq ($(strip $(BOOTLOADER_FILE)),)
- AVRDUDE_ISP_BURN_BOOTLOADER += -U flash:w:$(BOOTLOADER_PARENT)/$(BOOTLOADER_PATH)/$(BOOTLOADER_FILE):i
- endif
+ ifneq ($(strip $(BOOTLOADER_FILE)),)
+ AVRDUDE_ISP_BURN_BOOTLOADER += -U flash:w:$(BOOTLOADER_PARENT)/$(BOOTLOADER_PATH)/$(BOOTLOADER_FILE):i
endif
endif