Merge pull request #13794 from aabadie/pr/boards/samd21_bootloader_cl…

…eanup boards/samd21-bootloader*: small cleanup
RIOT-OS · Apr 6, 2020 · 2165327 · 2165327
2 parents 34e3861 + 0f9e56d
commit 2165327
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git 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/samd21-arduino-bootloader/reset.c b/boards/common/samd21-arduino-bootloader/reset.c
@@ -19,7 +19,7 @@
  * @}
  */
 
-#ifdef MODULE_BOARDS_COMMON_SAMD21_ARDUINO_BOOTLOADER
+#ifdef MODULE_USB_BOARD_RESET
 
 #define USB_H_USER_IS_RIOT_INTERNAL
 
@@ -45,4 +45,4 @@ void usb_board_reset_in_bootloader(void)
 }
 #else
 typedef int dont_be_pedantic;
-#endif /* MODULE_BOARDS_COMMON_SAMD21_ARDUINO_BOOTLOADER */
+#endif /* MODULE_USB_BOARD_RESET */
diff --git 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
@@ -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