RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

Makefile.include: include iotlab.single.inc.mk before checking FLASHFILE

Browse Source 
This way FLASHFILE is either already defined by the board and, if not,
the default one for iotlab can be used.
This commit is contained in:
Alexandre Abadie 2019-10-08 14:11:40 +02:00
parent 22a3f4d5b7
commit 41a2249ec6
No known key found for this signature in database
GPG Key ID: 1C919A403CAE1405
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Makefile.include
View File

@ -283,6 +283,10 @@ export PREFIX ?= $(if $(TARGET_ARCH),$(TARGET_ARCH)-)
# be done in makefile.iotlab.single.inc.mk which is included after. # be done in makefile.iotlab.single.inc.mk which is included after.
ifneq (,$(IOTLAB_NODE)) ifneq (,$(IOTLAB_NODE))
PROGRAMMER ?= iotlab PROGRAMMER ?= iotlab
# iotlab uses ELFFILE by default for flashing boards, except for WSN430.
ifeq (,$(filter wsn430-%,$(BOARD)))
FLASHFILE ?= $(ELFFILE)
endif
endif endif
# Add standard include directories # 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 # https://www.gnu.org/software/make/manual/html_node/Force-Targets.html
.PHONY: FORCE .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 ELFFILE ?= $(BINDIR)/$(APPLICATION).elf
HEXFILE ?= $(ELFFILE:.elf=.hex) HEXFILE ?= $(ELFFILE:.elf=.hex)
BINFILE ?= $(ELFFILE:.elf=.bin) 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 include $(RIOTBASE)/dist/testbed-support/Makefile.iotlab
endif endif
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 desvirt Makefile
include $(RIOTTOOLS)/desvirt/Makefile.desvirt include $(RIOTTOOLS)/desvirt/Makefile.desvirt