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

Add support for nonstandard makefile on upload

Browse source 
Allows for per-device makefiles

For example, Makefile-uno and Makefile-mega. This correctly spawns the
submake command with the appropriate makefile specified.
This commit is contained in:
John Ott 2017-04-27 21:45:22 -04:00
parent 807cf65f71
commit d59cab50ec
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Arduino.mk
View file

@ -1451,12 +1451,12 @@ error_on_caterina:
# Use submake so we can guarantee the reset happens # Use submake so we can guarantee the reset happens
# before the upload, even with make -j # before the upload, even with make -j
upload: $(TARGET_HEX) verify_size upload: $(TARGET_HEX) verify_size
$(MAKE) reset $(MAKE) -f $(firstword $(MAKEFILE_LIST)) reset
$(MAKE) do_upload $(MAKE) -f $(firstword $(MAKEFILE_LIST)) do_upload
raw_upload: $(TARGET_HEX) verify_size raw_upload: $(TARGET_HEX) verify_size
$(MAKE) error_on_caterina $(MAKE) -f $(firstword $(MAKEFILE_LIST)) error_on_caterina
$(MAKE) do_upload $(MAKE) -f $(firstword $(MAKEFILE_LIST)) do_upload
do_upload: do_upload:
$(AVRDUDE) $(AVRDUDE_COM_OPTS) $(AVRDUDE_ARD_OPTS) \ $(AVRDUDE) $(AVRDUDE_COM_OPTS) $(AVRDUDE_ARD_OPTS) \
@ -1467,12 +1467,12 @@ do_eeprom: $(TARGET_EEP) $(TARGET_HEX)
$(AVRDUDE_UPLOAD_EEP) $(AVRDUDE_UPLOAD_EEP)
eeprom: $(TARGET_HEX) verify_size eeprom: $(TARGET_HEX) verify_size
$(MAKE) reset $(MAKE) -f $(firstword $(MAKEFILE_LIST)) reset
$(MAKE) do_eeprom $(MAKE) -f $(firstword $(MAKEFILE_LIST)) do_eeprom
raw_eeprom: $(TARGET_HEX) verify_size raw_eeprom: $(TARGET_HEX) verify_size
$(MAKE) error_on_caterina $(MAKE) -f $(firstword $(MAKEFILE_LIST)) error_on_caterina
$(MAKE) do_eeprom $(MAKE) -f $(firstword $(MAKEFILE_LIST)) do_eeprom
reset: reset:
$(call arduino_output,Resetting Arduino...) $(call arduino_output,Resetting Arduino...)