diff --git a/boards/adafruit-clue/Makefile.dep b/boards/adafruit-clue/Makefile.dep index 130b71241b..b3b6754b6b 100644 --- a/boards/adafruit-clue/Makefile.dep +++ b/boards/adafruit-clue/Makefile.dep @@ -9,7 +9,7 @@ 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 += bootloader_nrfutil + FEATURES_REQUIRED += highlevel_stdio USEMODULE += usb_board_reset USEMODULE += stdio_cdc_acm endif diff --git a/boards/adafruit-clue/Makefile.features b/boards/adafruit-clue/Makefile.features index 83012828ed..1f4969f6d9 100644 --- a/boards/adafruit-clue/Makefile.features +++ b/boards/adafruit-clue/Makefile.features @@ -7,6 +7,6 @@ FEATURES_PROVIDED += periph_uart FEATURES_PROVIDED += periph_usbdev # Various other features (if any) -FEATURES_PROVIDED += bootloader_nrfutil +FEATURES_PROVIDED += highlevel_stdio include $(RIOTBOARD)/common/nrf52/Makefile.features diff --git a/boards/adafruit-itsybitsy-nrf52/Makefile.dep b/boards/adafruit-itsybitsy-nrf52/Makefile.dep index 18e5d17c60..6c6293050f 100644 --- a/boards/adafruit-itsybitsy-nrf52/Makefile.dep +++ b/boards/adafruit-itsybitsy-nrf52/Makefile.dep @@ -9,7 +9,7 @@ endif # enable bootloader reset over USB, requires USB bootloader to be used ifneq (,$(filter stdio_cdc_acm,$(USEMODULE))) - FEATURES_REQUIRED += bootloader_nrfutil + FEATURES_REQUIRED += highlevel_stdio USEMODULE += usb_board_reset endif diff --git a/boards/adafruit-itsybitsy-nrf52/Makefile.features b/boards/adafruit-itsybitsy-nrf52/Makefile.features index 83012828ed..1f4969f6d9 100644 --- a/boards/adafruit-itsybitsy-nrf52/Makefile.features +++ b/boards/adafruit-itsybitsy-nrf52/Makefile.features @@ -7,6 +7,6 @@ FEATURES_PROVIDED += periph_uart FEATURES_PROVIDED += periph_usbdev # Various other features (if any) -FEATURES_PROVIDED += bootloader_nrfutil +FEATURES_PROVIDED += highlevel_stdio include $(RIOTBOARD)/common/nrf52/Makefile.features diff --git a/boards/arduino-nano-33-ble/Makefile.dep b/boards/arduino-nano-33-ble/Makefile.dep index f13bbd3c9b..6d4f260117 100644 --- a/boards/arduino-nano-33-ble/Makefile.dep +++ b/boards/arduino-nano-33-ble/Makefile.dep @@ -9,7 +9,7 @@ ifeq (,$(filter-out stdio_cdc_acm,$(filter stdio_% slipdev_stdio,$(USEMODULE)))) USEMODULE += stdio_cdc_acm # This board requires support for Arduino bootloader. - FEATURES_REQUIRED += bootloader_arduino + FEATURES_REQUIRED += highlevel_stdio USEMODULE += usb_board_reset endif diff --git a/boards/arduino-nano-33-ble/Makefile.features b/boards/arduino-nano-33-ble/Makefile.features index a116c39cbb..1f4969f6d9 100644 --- a/boards/arduino-nano-33-ble/Makefile.features +++ b/boards/arduino-nano-33-ble/Makefile.features @@ -7,6 +7,6 @@ FEATURES_PROVIDED += periph_uart FEATURES_PROVIDED += periph_usbdev # Various other features (if any) -FEATURES_PROVIDED += bootloader_arduino +FEATURES_PROVIDED += highlevel_stdio include $(RIOTBOARD)/common/nrf52/Makefile.features diff --git a/boards/common/arduino-mkr/Makefile.features b/boards/common/arduino-mkr/Makefile.features index 08c79c508c..9888bd0a69 100644 --- a/boards/common/arduino-mkr/Makefile.features +++ b/boards/common/arduino-mkr/Makefile.features @@ -16,4 +16,4 @@ FEATURES_PROVIDED += periph_usbdev # Various other features (if any) FEATURES_PROVIDED += arduino FEATURES_PROVIDED += arduino_pwm -FEATURES_PROVIDED += bootloader_arduino +FEATURES_PROVIDED += highlevel_stdio diff --git a/boards/common/samd21-arduino-bootloader/Makefile.dep b/boards/common/samd21-arduino-bootloader/Makefile.dep index d1c9d54246..8d7365a9d2 100644 --- a/boards/common/samd21-arduino-bootloader/Makefile.dep +++ b/boards/common/samd21-arduino-bootloader/Makefile.dep @@ -2,4 +2,4 @@ USEMODULE += usb_board_reset USEMODULE += stdio_cdc_acm -FEATURES_REQUIRED += bootloader_arduino +FEATURES_REQUIRED += highlevel_stdio diff --git a/boards/common/sodaq/Makefile.features b/boards/common/sodaq/Makefile.features index 4cc1f1a620..4f6613e8d7 100644 --- a/boards/common/sodaq/Makefile.features +++ b/boards/common/sodaq/Makefile.features @@ -12,4 +12,4 @@ FEATURES_PROVIDED += periph_usbdev # Various other features (if any) FEATURES_PROVIDED += arduino -FEATURES_PROVIDED += bootloader_arduino +FEATURES_PROVIDED += highlevel_stdio diff --git a/boards/feather-m0/Makefile.features b/boards/feather-m0/Makefile.features index e1044fadd8..c43f111ff1 100644 --- a/boards/feather-m0/Makefile.features +++ b/boards/feather-m0/Makefile.features @@ -13,4 +13,4 @@ FEATURES_PROVIDED += periph_uart FEATURES_PROVIDED += periph_usbdev # Put other features for this board (in alphabetical order) -FEATURES_PROVIDED += bootloader_arduino +FEATURES_PROVIDED += highlevel_stdio diff --git a/boards/nrf52840dongle/Makefile.dep b/boards/nrf52840dongle/Makefile.dep index 18e5d17c60..6c6293050f 100644 --- a/boards/nrf52840dongle/Makefile.dep +++ b/boards/nrf52840dongle/Makefile.dep @@ -9,7 +9,7 @@ endif # enable bootloader reset over USB, requires USB bootloader to be used ifneq (,$(filter stdio_cdc_acm,$(USEMODULE))) - FEATURES_REQUIRED += bootloader_nrfutil + FEATURES_REQUIRED += highlevel_stdio USEMODULE += usb_board_reset endif diff --git a/boards/nrf52840dongle/Makefile.features b/boards/nrf52840dongle/Makefile.features index 80543d4ff7..bd678939fe 100644 --- a/boards/nrf52840dongle/Makefile.features +++ b/boards/nrf52840dongle/Makefile.features @@ -6,6 +6,6 @@ FEATURES_PROVIDED += periph_uart FEATURES_PROVIDED += periph_usbdev # Various other features (if any) -FEATURES_PROVIDED += bootloader_nrfutil +FEATURES_PROVIDED += highlevel_stdio include $(RIOTBOARD)/common/nrf52/Makefile.features diff --git a/boards/serpente/Makefile.features b/boards/serpente/Makefile.features index d7a00f01b2..ec13b2408e 100644 --- a/boards/serpente/Makefile.features +++ b/boards/serpente/Makefile.features @@ -2,7 +2,7 @@ CPU = samd21 CPU_MODEL = samd21e18a # Put defined MCU peripherals here (in alphabetical order) -FEATURES_PROVIDED += bootloader_arduino +FEATURES_PROVIDED += highlevel_stdio FEATURES_PROVIDED += periph_adc FEATURES_PROVIDED += periph_i2c FEATURES_PROVIDED += periph_pwm diff --git a/boards/wemos-zero/Makefile.features b/boards/wemos-zero/Makefile.features index d92557f453..2dbb57c787 100644 --- a/boards/wemos-zero/Makefile.features +++ b/boards/wemos-zero/Makefile.features @@ -1,3 +1,3 @@ include $(RIOTBOARD)/common/arduino-zero/Makefile.features -FEATURES_PROVIDED += bootloader_arduino +FEATURES_PROVIDED += highlevel_stdio diff --git a/makefiles/stdio.inc.mk b/makefiles/stdio.inc.mk index 5c1d3bff22..1073ad3745 100644 --- a/makefiles/stdio.inc.mk +++ b/makefiles/stdio.inc.mk @@ -44,13 +44,6 @@ ifneq (,$(filter stdio_uart,$(USEMODULE))) FEATURES_REQUIRED += periph_uart endif -ifeq (,$(filter stdio_cdc_acm,$(USEMODULE))) - # The arduino and nrfutil bootloader features cannot be used if the - # stdio_cdc_acm module is not used - FEATURES_BLACKLIST += bootloader_arduino - FEATURES_BLACKLIST += bootloader_nrfutil -endif - ifneq (,$(filter stdio_semihosting,$(USEMODULE))) USEMODULE += xtimer FEATURES_REQUIRED += cpu_core_cortexm