From 41a2249ec6326e08807f1f04868a5c48bc071d4b Mon Sep 17 00:00:00 2001 From: Alexandre Abadie Date: Tue, 8 Oct 2019 14:11:40 +0200 Subject: [PATCH] Makefile.include: include iotlab.single.inc.mk before checking FLASHFILE This way FLASHFILE is either already defined by the board and, if not, the default one for iotlab can be used. --- Makefile.include | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/Makefile.include b/Makefile.include index 456f4da850..62a9bab9cd 100644 --- a/Makefile.include +++ b/Makefile.include @@ -283,6 +283,10 @@ export PREFIX ?= $(if $(TARGET_ARCH),$(TARGET_ARCH)-) # be done in makefile.iotlab.single.inc.mk which is included after. ifneq (,$(IOTLAB_NODE)) PROGRAMMER ?= iotlab + # iotlab uses ELFFILE by default for flashing boards, except for WSN430. + ifeq (,$(filter wsn430-%,$(BOARD))) + FLASHFILE ?= $(ELFFILE) + endif endif # Add standard include directories @@ -442,6 +446,11 @@ include $(RIOTMAKE)/modules.inc.mk # https://www.gnu.org/software/make/manual/html_node/Force-Targets.html .PHONY: FORCE +ifneq (,$(IOTLAB_NODE)) + # iot-lab serial and flasher + include $(RIOTBASE)/dist/testbed-support/makefile.iotlab.single.inc.mk +endif + ELFFILE ?= $(BINDIR)/$(APPLICATION).elf HEXFILE ?= $(ELFFILE:.elf=.hex) BINFILE ?= $(ELFFILE:.elf=.bin) @@ -807,10 +816,6 @@ ifneq (,$(filter iotlab-m3 wsn430-v1_3b wsn430-v1_4,$(BOARD))) include $(RIOTBASE)/dist/testbed-support/Makefile.iotlab endif endif -ifneq (,$(IOTLAB_NODE)) - # iot-lab serial and flasher - include $(RIOTBASE)/dist/testbed-support/makefile.iotlab.single.inc.mk -endif # Include desvirt Makefile include $(RIOTTOOLS)/desvirt/Makefile.desvirt