From a3bf3ef95b8ac16c83b5b06bf115361f73253f9c Mon Sep 17 00:00:00 2001 From: "Martine S. Lenders" Date: Wed, 15 Jan 2020 14:15:29 +0100 Subject: [PATCH] Makefile.dep: disable stdio_rtt with any other STDIO than stdio_rtt f5cbe00118 disables `stdio_rtt` when `stdio_uart` is used. However, if a board has `periph_usbdev` in `FEATURES_PROVIDED` and `stdio_cdc_acm` is used by the application, linking fails, as now both `stdio_rtt` and `stdio_cdc_acm` implement the STDIO functions. This fix excludes `stdio_rtt` if any STDIO but `stdio_rtt` is provided. If no STDIO is provided the fall-back is used as before. --- Makefile.dep | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile.dep b/Makefile.dep index f2abb29d85..6e8fb7a2cc 100644 --- a/Makefile.dep +++ b/Makefile.dep @@ -468,8 +468,10 @@ endif ifneq (,$(filter stdio_uart,$(USEMODULE))) FEATURES_REQUIRED += periph_uart +endif - # stdio_rtt cannot be used when stdio_uart is loaded +ifneq (,$(filter stdio_cdc_acm stdio_null stdio_uart,$(USEMODULE))) + # stdio_rtt cannot be used when another STDIO is loaded DISABLE_MODULE += stdio_rtt endif