From c2934001549f3b2bf3a0e4c1792602c4762f05dc Mon Sep 17 00:00:00 2001 From: Alexandre Abadie Date: Tue, 8 Dec 2020 13:15:03 +0100 Subject: [PATCH] Makefile.include: include serial.inc.mk before emulator --- Makefile.include | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile.include b/Makefile.include index 72b1039274..69cc428e57 100644 --- a/Makefile.include +++ b/Makefile.include @@ -397,6 +397,10 @@ include $(BOARDDIR)/Makefile.include INCLUDES += -I$(RIOTCPU)/$(CPU)/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 ifeq (1,$(EMULATE)) # Use renode as default emulator @@ -406,10 +410,6 @@ ifeq (1,$(EMULATE)) DEBUGDEPS += $(EMULATORDEPS) 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 $(RIOTMAKE)/tools/$(PROGRAMMER).inc.mk