From 0f9e56d0ff2d42fd3560806402293666da8aaf39 Mon Sep 17 00:00:00 2001 From: Alexandre Abadie Date: Thu, 2 Apr 2020 16:42:33 +0200 Subject: [PATCH] boards/samd21-bootloader: don't use bootloader with slipdev_stdio --- boards/common/arduino-mkr/Makefile.dep | 2 +- boards/common/sodaq/Makefile.dep | 2 +- boards/feather-m0/Makefile.dep | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/boards/common/arduino-mkr/Makefile.dep b/boards/common/arduino-mkr/Makefile.dep index e33b5e122e..d5a09e2469 100644 --- a/boards/common/arduino-mkr/Makefile.dep +++ b/boards/common/arduino-mkr/Makefile.dep @@ -4,7 +4,7 @@ endif # use arduino-bootloader only if no other stdio_% other than stdio_cdc_acm # is requested -ifeq (,$(filter-out stdio_cdc_acm,$(filter stdio_%,$(USEMODULE)))) +ifeq (,$(filter-out stdio_cdc_acm,$(filter stdio_% slipdev_stdio,$(USEMODULE)))) USEMODULE += boards_common_samd21-arduino-bootloader endif diff --git a/boards/common/sodaq/Makefile.dep b/boards/common/sodaq/Makefile.dep index e33b5e122e..d5a09e2469 100644 --- a/boards/common/sodaq/Makefile.dep +++ b/boards/common/sodaq/Makefile.dep @@ -4,7 +4,7 @@ endif # use arduino-bootloader only if no other stdio_% other than stdio_cdc_acm # is requested -ifeq (,$(filter-out stdio_cdc_acm,$(filter stdio_%,$(USEMODULE)))) +ifeq (,$(filter-out stdio_cdc_acm,$(filter stdio_% slipdev_stdio,$(USEMODULE)))) USEMODULE += boards_common_samd21-arduino-bootloader endif diff --git a/boards/feather-m0/Makefile.dep b/boards/feather-m0/Makefile.dep index e33b5e122e..d5a09e2469 100644 --- a/boards/feather-m0/Makefile.dep +++ b/boards/feather-m0/Makefile.dep @@ -4,7 +4,7 @@ endif # use arduino-bootloader only if no other stdio_% other than stdio_cdc_acm # is requested -ifeq (,$(filter-out stdio_cdc_acm,$(filter stdio_%,$(USEMODULE)))) +ifeq (,$(filter-out stdio_cdc_acm,$(filter stdio_% slipdev_stdio,$(USEMODULE)))) USEMODULE += boards_common_samd21-arduino-bootloader endif