riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Makefile.include: include serial.inc.mk before emulator

Browse Source
This commit is contained in:
Alexandre Abadie 2020-12-08 13:15:03 +01:00
parent 08108f85b4
commit c293400154
No known key found for this signature in database
GPG Key ID: 1C919A403CAE1405
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile.include
View File

@ -397,6 +397,10 @@ include $(BOARDDIR)/Makefile.include
INCLUDES += -I$(RIOTCPU)/$(CPU)/include INCLUDES += -I$(RIOTCPU)/$(CPU)/include
include $(RIOTCPU)/$(CPU)/Makefile.include include $(RIOTCPU)/$(CPU)/Makefile.include
# Include common serial logic to define TERMPROG, TERMFLAGS variables based on
# the content of RIOT_TERMINAL
include $(RIOTMAKE)/tools/serial.inc.mk
# Include emulator code when required and if available # Include emulator code when required and if available
ifeq (1,$(EMULATE)) ifeq (1,$(EMULATE))
# Use renode as default emulator # Use renode as default emulator
@ -406,10 +410,6 @@ ifeq (1,$(EMULATE))
DEBUGDEPS += $(EMULATORDEPS) DEBUGDEPS += $(EMULATORDEPS)
endif endif
# Include common serial logic to define TERMPROG, TERMFLAGS variables based on
# the content of RIOT_TERMINAL
include $(RIOTMAKE)/tools/serial.inc.mk
# Include common programmer logic if available # Include common programmer logic if available
-include $(RIOTMAKE)/tools/$(PROGRAMMER).inc.mk -include $(RIOTMAKE)/tools/$(PROGRAMMER).inc.mk