From eb20cfe9cad0edc71d574a79debc7517f025f207 Mon Sep 17 00:00:00 2001 From: Alexandre Abadie Date: Sat, 12 Oct 2019 23:29:58 +0200 Subject: [PATCH] Makefile.dep: blacklist bootloader_arduino feature when required - bootloader_arduino cannot be used if stdio_cdc_acm is not used - stdio_cdc_acm is disabled when other stdio modules are already used --- Makefile.dep | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/Makefile.dep b/Makefile.dep index 0ded69d32c..21f5d2f2ef 100644 --- a/Makefile.dep +++ b/Makefile.dep @@ -492,6 +492,17 @@ ifneq (,$(filter stdio_cdc_acm stdio_null stdio_uart slipdev_stdio,$(USEMODULE)) DISABLE_MODULE += stdio_rtt endif +ifneq (,$(filter stdio_rtt stdio_null stdio_uart slipdev_stdio,$(USEMODULE))) + # stdio_cdc_acm cannot be used when another STDIO is loaded + DISABLE_MODULE += stdio_cdc_acm +endif + +ifeq (,$(filter stdio_cdc_acm,$(USEMODULE))) + # The arduino bootloader feature cannot be used if the stdio_cdc_acm module + # is not used + FEATURES_BLACKLIST += bootloader_arduino +endif + ifneq (,$(filter isrpipe,$(USEMODULE))) USEMODULE += tsrb endif