fixup! boards: provide stdio_rtt as default module where required

RIOT-OS · Jan 13, 2020 · f27c7d5 · f27c7d5
1 parent fbd1212
commit f27c7d5
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/boards/ruuvitag/Makefile.include b/boards/ruuvitag/Makefile.include
@@ -1,5 +1,10 @@
-# use JLink Segger RTT by default
-RIOT_TERMINAL ?= jlink
+# HACK: replicate dependency resolution in Makefile.dep, only works
+# if `USEMODULE` or `DEFAULT_MODULE` is set by the command line or in the
+# application Makefile.
+ifeq (,$(filter stdio_%,$(DISABLE_MODULE) $(USEMODULE)))
+  RIOT_TERMINAL ?= jlink
+endif
+
 include $(RIOTMAKE)/tools/serial.inc.mk
 
 # use shared Makefile.include

diff --git a/boards/thingy52/Makefile.include b/boards/thingy52/Makefile.include
@@ -1,5 +1,10 @@
-# use JLink Segger RTT by default
-RIOT_TERMINAL ?= jlink
+# HACK: replicate dependency resolution in Makefile.dep, only works
+# if `USEMODULE` or `DEFAULT_MODULE` is set by the command line or in the
+# application Makefile.
+ifeq (,$(filter stdio_%,$(DISABLE_MODULE) $(USEMODULE)))
+  RIOT_TERMINAL ?= jlink
+endif
+
 include $(RIOTMAKE)/tools/serial.inc.mk
 
 # use shared Makefile.include