kaspar/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-12-25 14:33:52 +01:00
Code Releases Activity

Merge pull request #13794 from aabadie/pr/boards/samd21_bootloader_cleanup

Browse Source 
boards/samd21-bootloader*: small cleanup
This commit is contained in:
Francisco 2020-04-06 09:35:04 +02:00 committed by GitHub
commit 2165327bbf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
boards/common/arduino-mkr/Makefile.dep
View File

@ -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

4
boards/common/samd21-arduino-bootloader/reset.c
View File

@ -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 */

2
boards/common/sodaq/Makefile.dep
View File

@ -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

2
boards/feather-m0/Makefile.dep
View File

@ -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