diff options
| author | Simon John <git@the-jedi.co.uk> | 2015-12-30 01:02:16 +0000 |
|---|---|---|
| committer | Simon John <git@the-jedi.co.uk> | 2015-12-30 01:02:16 +0000 |
| commit | 2326da3a5065061d45720e43ad859a2778a5710d (patch) | |
| tree | 025d14ef30ed3ff6c552c7c3da25319702fbe51e /Arduino.mk | |
| parent | 7e6a3e252b52adc4e949bc3421958ba8ca4ab053 (diff) | |
| parent | c67f505a710c594c36974d23b3223a95aabd9c8f (diff) | |
Merge pull request #403 from sej7278/master
Removed the check for BOOTLOADER_PATH being empty
Tested on 1.0.5 and 1.6.7, last commit of 2015?
Diffstat (limited to 'Arduino.mk')
| -rw-r--r-- | Arduino.mk | 6 |
1 files changed, 2 insertions, 4 deletions
@@ -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 |