diff --git a/boards/adafruit-clue/Makefile.dep b/boards/adafruit-clue/Makefile.dep index b3b6754b6b..1d896eaf29 100644 --- a/boards/adafruit-clue/Makefile.dep +++ b/boards/adafruit-clue/Makefile.dep @@ -6,13 +6,5 @@ ifneq (,$(filter saul_default,$(USEMODULE))) USEMODULE += sht3x endif -# use nrfutil-bootloader/stdio_cdc_acm only if no other stdio_% other than stdio_cdc_acm -# is requested -ifeq (,$(filter-out stdio_cdc_acm,$(filter stdio_% slipdev_stdio,$(USEMODULE)))) - FEATURES_REQUIRED += highlevel_stdio - USEMODULE += usb_board_reset - USEMODULE += stdio_cdc_acm -endif - -# include common nrf52 dependencies +include $(RIOTBOARD)/common/nrf52/bootloader_nrfutil.dep.mk include $(RIOTBOARD)/common/nrf52/Makefile.dep diff --git a/boards/adafruit-itsybitsy-nrf52/Makefile.dep b/boards/adafruit-itsybitsy-nrf52/Makefile.dep index 6c6293050f..b72178a1f7 100644 --- a/boards/adafruit-itsybitsy-nrf52/Makefile.dep +++ b/boards/adafruit-itsybitsy-nrf52/Makefile.dep @@ -2,15 +2,5 @@ ifneq (,$(filter saul_default,$(USEMODULE))) USEMODULE += saul_gpio endif -ifeq (,$(filter-out stdio_cdc_acm,$(filter stdio_% slipdev_stdio,$(USEMODULE)))) - # Use stdio_cdc_acm only if no other stdio is requested explicitly. - USEMODULE += stdio_cdc_acm -endif - -# enable bootloader reset over USB, requires USB bootloader to be used -ifneq (,$(filter stdio_cdc_acm,$(USEMODULE))) - FEATURES_REQUIRED += highlevel_stdio - USEMODULE += usb_board_reset -endif - +include $(RIOTBOARD)/common/nrf52/bootloader_nrfutil.dep.mk include $(RIOTBOARD)/common/nrf52/Makefile.dep diff --git a/boards/arduino-nano-33-ble/Makefile.dep b/boards/arduino-nano-33-ble/Makefile.dep index 6d4f260117..b72178a1f7 100644 --- a/boards/arduino-nano-33-ble/Makefile.dep +++ b/boards/arduino-nano-33-ble/Makefile.dep @@ -2,16 +2,5 @@ ifneq (,$(filter saul_default,$(USEMODULE))) USEMODULE += saul_gpio endif -# use arduino-bootloader only if no other stdio_% other than stdio_cdc_acm -# is requested -ifeq (,$(filter-out stdio_cdc_acm,$(filter stdio_% slipdev_stdio,$(USEMODULE)))) - # Provide stdio over USB by default - USEMODULE += stdio_cdc_acm - - # This board requires support for Arduino bootloader. - FEATURES_REQUIRED += highlevel_stdio - USEMODULE += usb_board_reset -endif - -# include common nrf52 dependencies +include $(RIOTBOARD)/common/nrf52/bootloader_nrfutil.dep.mk include $(RIOTBOARD)/common/nrf52/Makefile.dep diff --git a/boards/common/makefiles/stdio_cdc_acm.mk b/boards/common/makefiles/stdio_cdc_acm.mk new file mode 100644 index 0000000000..18569997bc --- /dev/null +++ b/boards/common/makefiles/stdio_cdc_acm.mk @@ -0,0 +1,5 @@ +ifeq (,$(filter-out stdio_cdc_acm,$(filter stdio_% slipdev_stdio,$(USEMODULE)))) + # Use stdio_cdc_acm only if no other stdio is requested explicitly. + USEMODULE += stdio_cdc_acm + FEATURES_REQUIRED += highlevel_stdio +endif diff --git a/boards/common/nrf52/bootloader_nrfutil.dep.mk b/boards/common/nrf52/bootloader_nrfutil.dep.mk new file mode 100644 index 0000000000..e926d8fd30 --- /dev/null +++ b/boards/common/nrf52/bootloader_nrfutil.dep.mk @@ -0,0 +1,6 @@ +include $(RIOTBOARD)/common/makefiles/stdio_cdc_acm.mk + +# enable bootloader reset over USB, requires USB bootloader to be used +ifneq (,$(filter stdio_cdc_acm,$(USEMODULE))) + USEMODULE += usb_board_reset +endif diff --git a/boards/nrf52840dongle/Makefile.dep b/boards/nrf52840dongle/Makefile.dep index 6c6293050f..b72178a1f7 100644 --- a/boards/nrf52840dongle/Makefile.dep +++ b/boards/nrf52840dongle/Makefile.dep @@ -2,15 +2,5 @@ ifneq (,$(filter saul_default,$(USEMODULE))) USEMODULE += saul_gpio endif -ifeq (,$(filter-out stdio_cdc_acm,$(filter stdio_% slipdev_stdio,$(USEMODULE)))) - # Use stdio_cdc_acm only if no other stdio is requested explicitly. - USEMODULE += stdio_cdc_acm -endif - -# enable bootloader reset over USB, requires USB bootloader to be used -ifneq (,$(filter stdio_cdc_acm,$(USEMODULE))) - FEATURES_REQUIRED += highlevel_stdio - USEMODULE += usb_board_reset -endif - +include $(RIOTBOARD)/common/nrf52/bootloader_nrfutil.dep.mk include $(RIOTBOARD)/common/nrf52/Makefile.dep