From c67f505a710c594c36974d23b3223a95aabd9c8f Mon Sep 17 00:00:00 2001 From: Simon John Date: Mon, 28 Dec 2015 10:05:53 +0000 Subject: [PATCH] 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 --- Arduino.mk | 6 ++---- HISTORY.md | 1 + 2 files changed, 3 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 diff --git a/HISTORY.md b/HISTORY.md index 39a3522..47f1dc8 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -23,6 +23,7 @@ I tried to give credit whenever possible. If I have missed anyone, kindly add it - Fix: Rename VENDOR to ARDMK_VENDOR to workaround tcsh issue (Issue #386) (https://github.com/sej7278) - Fix: Document OSX 1.0/1.6 ARDUINO_DIR differences (https://github.com/thomaskilian) - Fix: Fix regex to support BOARD_TAGs with hyphens e.g. attiny44-20 (https://github.com/sej7278) +- Fix: Remove check for BOOTLOADER_PATH, just check for BOOTLOADER_FILE (Issue #402) (https://github.com/sej7278) ### 1.5 (2015-04-07) - New: Add support for new 1.5.x library layout (Issue #275) (https://github.com/lukasz-e)