diff options
| author | Simon John <git@the-jedi.co.uk> | 2013-12-17 09:15:33 +0000 |
|---|---|---|
| committer | Simon John <git@the-jedi.co.uk> | 2013-12-17 09:15:33 +0000 |
| commit | fc92c24cc0f99e64dac8218c1fc2e4d92c5afdb4 (patch) | |
| tree | 742aa3d24d5c92bdbb228729d4ab75ec476e46c2 /arduino-mk/Arduino.mk | |
| parent | 38255ed0f0ee2fd0fa2a9e5629c9409ad0d52d29 (diff) | |
User-defined or calculated bootloader parent directory, allows for
relative paths as defined in boards.txt e.g. "atmega"
Also added [USER] to ARDUINO_SKETCHBOOK detection
Fixes #126
Diffstat (limited to 'arduino-mk/Arduino.mk')
| -rw-r--r-- | arduino-mk/Arduino.mk | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/arduino-mk/Arduino.mk b/arduino-mk/Arduino.mk index d8eb82c..256e4bf 100644 --- a/arduino-mk/Arduino.mk +++ b/arduino-mk/Arduino.mk @@ -339,7 +339,7 @@ ifndef ARDUINO_SKETCHBOOK $(call show_config_variable,ARDUINO_SKETCHBOOK,[DEFAULT]) endif else - $(call show_config_variable,ARDUINO_SKETCHBOOK) + $(call show_config_variable,ARDUINO_SKETCHBOOK,[USER]) endif ######################################################################## @@ -851,6 +851,14 @@ ifneq (,$(strip $(SYS_LIB_NAMES))) $(foreach lib,$(SYS_LIB_NAMES),$(call show_config_info, $(lib),[SYSTEM])) endif +# either calculate parent dir from arduino dir, or user-defined path +ifndef BOOTLOADER_PARENT + BOOTLOADER_PARENT = $(ARDUINO_DIR)/hardware/arduino/bootloaders + $(call show_config_variable,BOOTLOADER_PARENT,[COMPUTED],(from ARDUINO_DIR)) +else + $(call show_config_variable,BOOTLOADER_PARENT,[USER]) +endif + # end of config output $(call show_separator) @@ -1030,11 +1038,10 @@ ifndef AVRDUDE_ISP_FUSES_PRE endif # Bootloader file settings -# TODO: Handle relative bootloader file path as well ifndef AVRDUDE_ISP_BURN_BOOTLOADER ifneq ($(strip $(BOOTLOADER_PATH)),) ifneq ($(strip $(BOOTLOADER_FILE)),) - AVRDUDE_ISP_BURN_BOOTLOADER += -U flash:w:$(BOOTLOADER_PATH)/$(BOOTLOADER_FILE):i + AVRDUDE_ISP_BURN_BOOTLOADER += -U flash:w:$(BOOTLOADER_PARENT)/$(BOOTLOADER_PATH)/$(BOOTLOADER_FILE):i endif endif endif |