riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

boards: remove the bootloader_% pseudo-feature

Browse Source 
This feature is only used to blacklist stdio via CDC ACM.
Introduce the `highlevel_stdio` feature instead to indicate
that stdio functionality requires a running thread to print
anything
This commit is contained in:
Benjamin Valentin 2020-09-22 15:05:57 +02:00
parent 2de78a9862
commit 971f0f6fee
15 changed files with 14 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
boards/adafruit-clue/Makefile.dep
View File

@ -9,7 +9,7 @@ endif
# use nrfutil-bootloader/stdio_cdc_acm only if no other stdio_% other than stdio_cdc_acm # use nrfutil-bootloader/stdio_cdc_acm only if no other stdio_% other than stdio_cdc_acm
# is requested # is requested
ifeq (,$(filter-out stdio_cdc_acm,$(filter stdio_% slipdev_stdio,$(USEMODULE)))) ifeq (,$(filter-out stdio_cdc_acm,$(filter stdio_% slipdev_stdio,$(USEMODULE))))
FEATURES_REQUIRED += bootloader_nrfutil FEATURES_REQUIRED += highlevel_stdio
USEMODULE += usb_board_reset USEMODULE += usb_board_reset
USEMODULE += stdio_cdc_acm USEMODULE += stdio_cdc_acm
endif endif

2
boards/adafruit-clue/Makefile.features
View File

@ -7,6 +7,6 @@ FEATURES_PROVIDED += periph_uart
FEATURES_PROVIDED += periph_usbdev FEATURES_PROVIDED += periph_usbdev
# Various other features (if any) # Various other features (if any)
FEATURES_PROVIDED += bootloader_nrfutil FEATURES_PROVIDED += highlevel_stdio
include $(RIOTBOARD)/common/nrf52/Makefile.features include $(RIOTBOARD)/common/nrf52/Makefile.features

2
boards/adafruit-itsybitsy-nrf52/Makefile.dep
View File

@ -9,7 +9,7 @@ endif
# enable bootloader reset over USB, requires USB bootloader to be used # enable bootloader reset over USB, requires USB bootloader to be used
ifneq (,$(filter stdio_cdc_acm,$(USEMODULE))) ifneq (,$(filter stdio_cdc_acm,$(USEMODULE)))
FEATURES_REQUIRED += bootloader_nrfutil FEATURES_REQUIRED += highlevel_stdio
USEMODULE += usb_board_reset USEMODULE += usb_board_reset
endif endif

2
boards/adafruit-itsybitsy-nrf52/Makefile.features
View File

@ -7,6 +7,6 @@ FEATURES_PROVIDED += periph_uart
FEATURES_PROVIDED += periph_usbdev FEATURES_PROVIDED += periph_usbdev
# Various other features (if any) # Various other features (if any)
FEATURES_PROVIDED += bootloader_nrfutil FEATURES_PROVIDED += highlevel_stdio
include $(RIOTBOARD)/common/nrf52/Makefile.features include $(RIOTBOARD)/common/nrf52/Makefile.features

2
boards/arduino-nano-33-ble/Makefile.dep
View File

@ -9,7 +9,7 @@ ifeq (,$(filter-out stdio_cdc_acm,$(filter stdio_% slipdev_stdio,$(USEMODULE))))
USEMODULE += stdio_cdc_acm USEMODULE += stdio_cdc_acm
# This board requires support for Arduino bootloader. # This board requires support for Arduino bootloader.
FEATURES_REQUIRED += bootloader_arduino FEATURES_REQUIRED += highlevel_stdio
USEMODULE += usb_board_reset USEMODULE += usb_board_reset
endif endif

2
boards/arduino-nano-33-ble/Makefile.features
View File

@ -7,6 +7,6 @@ FEATURES_PROVIDED += periph_uart
FEATURES_PROVIDED += periph_usbdev FEATURES_PROVIDED += periph_usbdev
# Various other features (if any) # Various other features (if any)
FEATURES_PROVIDED += bootloader_arduino FEATURES_PROVIDED += highlevel_stdio
include $(RIOTBOARD)/common/nrf52/Makefile.features include $(RIOTBOARD)/common/nrf52/Makefile.features

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

@ -16,4 +16,4 @@ FEATURES_PROVIDED += periph_usbdev
# Various other features (if any) # Various other features (if any)
FEATURES_PROVIDED += arduino FEATURES_PROVIDED += arduino
FEATURES_PROVIDED += arduino_pwm FEATURES_PROVIDED += arduino_pwm
FEATURES_PROVIDED += bootloader_arduino FEATURES_PROVIDED += highlevel_stdio

2
boards/common/samd21-arduino-bootloader/Makefile.dep
View File

@ -2,4 +2,4 @@
USEMODULE += usb_board_reset USEMODULE += usb_board_reset
USEMODULE += stdio_cdc_acm USEMODULE += stdio_cdc_acm
FEATURES_REQUIRED += bootloader_arduino FEATURES_REQUIRED += highlevel_stdio

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

@ -12,4 +12,4 @@ FEATURES_PROVIDED += periph_usbdev
# Various other features (if any) # Various other features (if any)
FEATURES_PROVIDED += arduino FEATURES_PROVIDED += arduino
FEATURES_PROVIDED += bootloader_arduino FEATURES_PROVIDED += highlevel_stdio

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

@ -13,4 +13,4 @@ FEATURES_PROVIDED += periph_uart
FEATURES_PROVIDED += periph_usbdev FEATURES_PROVIDED += periph_usbdev
# Put other features for this board (in alphabetical order) # Put other features for this board (in alphabetical order)
FEATURES_PROVIDED += bootloader_arduino FEATURES_PROVIDED += highlevel_stdio

2
boards/nrf52840dongle/Makefile.dep
View File

@ -9,7 +9,7 @@ endif
# enable bootloader reset over USB, requires USB bootloader to be used # enable bootloader reset over USB, requires USB bootloader to be used
ifneq (,$(filter stdio_cdc_acm,$(USEMODULE))) ifneq (,$(filter stdio_cdc_acm,$(USEMODULE)))
FEATURES_REQUIRED += bootloader_nrfutil FEATURES_REQUIRED += highlevel_stdio
USEMODULE += usb_board_reset USEMODULE += usb_board_reset
endif endif

2
boards/nrf52840dongle/Makefile.features
View File

@ -6,6 +6,6 @@ FEATURES_PROVIDED += periph_uart
FEATURES_PROVIDED += periph_usbdev FEATURES_PROVIDED += periph_usbdev
# Various other features (if any) # Various other features (if any)
FEATURES_PROVIDED += bootloader_nrfutil FEATURES_PROVIDED += highlevel_stdio
include $(RIOTBOARD)/common/nrf52/Makefile.features include $(RIOTBOARD)/common/nrf52/Makefile.features

2
boards/serpente/Makefile.features
View File

@ -2,7 +2,7 @@ CPU = samd21
CPU_MODEL = samd21e18a CPU_MODEL = samd21e18a
# Put defined MCU peripherals here (in alphabetical order) # Put defined MCU peripherals here (in alphabetical order)
FEATURES_PROVIDED += bootloader_arduino FEATURES_PROVIDED += highlevel_stdio
FEATURES_PROVIDED += periph_adc FEATURES_PROVIDED += periph_adc
FEATURES_PROVIDED += periph_i2c FEATURES_PROVIDED += periph_i2c
FEATURES_PROVIDED += periph_pwm FEATURES_PROVIDED += periph_pwm

2
boards/wemos-zero/Makefile.features
View File

@ -1,3 +1,3 @@
include $(RIOTBOARD)/common/arduino-zero/Makefile.features include $(RIOTBOARD)/common/arduino-zero/Makefile.features
FEATURES_PROVIDED += bootloader_arduino FEATURES_PROVIDED += highlevel_stdio

7
makefiles/stdio.inc.mk
View File

@ -44,13 +44,6 @@ ifneq (,$(filter stdio_uart,$(USEMODULE)))
FEATURES_REQUIRED += periph_uart FEATURES_REQUIRED += periph_uart
endif 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))) ifneq (,$(filter stdio_semihosting,$(USEMODULE)))
USEMODULE += xtimer USEMODULE += xtimer
FEATURES_REQUIRED += cpu_core_cortexm FEATURES_REQUIRED += cpu_core_cortexm