From a863a43207e85d029bdbb53ab3d2b4d7da79e3e3 Mon Sep 17 00:00:00 2001 From: Benjamin Valentin Date: Tue, 22 Sep 2020 15:10:35 +0200 Subject: [PATCH] kconfigs: replace BOOTLOADER_% feature with HIGHLEVEL_STDIO --- boards/adafruit-clue/Kconfig | 2 +- boards/adafruit-itsybitsy-nrf52/Kconfig | 2 +- boards/arduino-nano-33-ble/Kconfig | 2 +- boards/common/arduino-mkr/Kconfig | 2 +- boards/common/sodaq/Kconfig | 2 +- boards/feather-m0-wifi/Kconfig | 2 +- boards/feather-m0/Kconfig | 2 +- boards/nrf52840dongle/Kconfig | 2 +- boards/serpente/Kconfig | 2 +- boards/wemos-zero/Kconfig | 2 +- cpu/nrf5x_common/Kconfig | 5 ----- kconfigs/Kconfig.features | 12 +++++++----- 12 files changed, 17 insertions(+), 20 deletions(-) diff --git a/boards/adafruit-clue/Kconfig b/boards/adafruit-clue/Kconfig index dcfad32ed9..a92ae326da 100644 --- a/boards/adafruit-clue/Kconfig +++ b/boards/adafruit-clue/Kconfig @@ -16,6 +16,6 @@ config BOARD_ADAFRUIT_CLUE select HAS_PERIPH_SPI select HAS_PERIPH_UART select HAS_PERIPH_USBDEV - select HAS_BOOTLOADER_NRFUTIL + select HAS_HIGHLEVEL_STDIO source "$(RIOTBOARD)/common/nrf52/Kconfig" diff --git a/boards/adafruit-itsybitsy-nrf52/Kconfig b/boards/adafruit-itsybitsy-nrf52/Kconfig index 622df25665..24655e4205 100644 --- a/boards/adafruit-itsybitsy-nrf52/Kconfig +++ b/boards/adafruit-itsybitsy-nrf52/Kconfig @@ -16,6 +16,6 @@ config BOARD_ADAFRUIT_ITSYBITSY_NRF52 select HAS_PERIPH_SPI select HAS_PERIPH_UART select HAS_PERIPH_USBDEV - select HAS_BOOTLOADER_NRFUTIL + select HAS_HIGHLEVEL_STDIO source "$(RIOTBOARD)/common/nrf52/Kconfig" diff --git a/boards/arduino-nano-33-ble/Kconfig b/boards/arduino-nano-33-ble/Kconfig index b3dcc23c49..0c943d1d7f 100644 --- a/boards/arduino-nano-33-ble/Kconfig +++ b/boards/arduino-nano-33-ble/Kconfig @@ -16,6 +16,6 @@ config BOARD_ARDUINO_NANO_33_BLE select HAS_PERIPH_SPI select HAS_PERIPH_UART select HAS_PERIPH_USBDEV - select HAS_BOOTLOADER_ARDUINO + select HAS_HIGHLEVEL_STDIO source "$(RIOTBOARD)/common/nrf52/Kconfig" diff --git a/boards/common/arduino-mkr/Kconfig b/boards/common/arduino-mkr/Kconfig index 7ba19c6de8..e9f9185348 100644 --- a/boards/common/arduino-mkr/Kconfig +++ b/boards/common/arduino-mkr/Kconfig @@ -18,4 +18,4 @@ config BOARD_COMMON_ARDUINO_MKR select HAS_PERIPH_USBDEV select HAS_ARDUINO select HAS_ARDUINO_PWM - select HAS_BOOTLOADER_ARDUINO + select HAS_HIGHLEVEL_STDIO diff --git a/boards/common/sodaq/Kconfig b/boards/common/sodaq/Kconfig index 20e893ce21..5199c476e7 100644 --- a/boards/common/sodaq/Kconfig +++ b/boards/common/sodaq/Kconfig @@ -15,4 +15,4 @@ config BOARD_COMMON_SODAQ select HAS_PERIPH_UART select HAS_PERIPH_USBDEV select HAS_ARDUINO - select HAS_BOOTLOADER_ARDUINO + select HAS_HIGHLEVEL_STDIO diff --git a/boards/feather-m0-wifi/Kconfig b/boards/feather-m0-wifi/Kconfig index 1cac9ec03b..ba275b78a4 100644 --- a/boards/feather-m0-wifi/Kconfig +++ b/boards/feather-m0-wifi/Kconfig @@ -20,4 +20,4 @@ config BOARD_FEATHER_M0_WIFI select HAS_PERIPH_TIMER select HAS_PERIPH_UART select HAS_PERIPH_USBDEV - select HAS_BOOTLOADER_ARDUINO + select HAS_HIGHLEVEL_STDIO diff --git a/boards/feather-m0/Kconfig b/boards/feather-m0/Kconfig index 73190a0167..cded0d326b 100644 --- a/boards/feather-m0/Kconfig +++ b/boards/feather-m0/Kconfig @@ -20,4 +20,4 @@ config BOARD_FEATHER_M0 select HAS_PERIPH_TIMER select HAS_PERIPH_UART select HAS_PERIPH_USBDEV - select HAS_BOOTLOADER_ARDUINO + select HAS_HIGHLEVEL_STDIO diff --git a/boards/nrf52840dongle/Kconfig b/boards/nrf52840dongle/Kconfig index 0aa02499dd..e8f64a9a70 100644 --- a/boards/nrf52840dongle/Kconfig +++ b/boards/nrf52840dongle/Kconfig @@ -15,6 +15,6 @@ config BOARD_NRF52840DONGLE select HAS_PERIPH_PWM select HAS_PERIPH_UART select HAS_PERIPH_USBDEV - select HAS_BOOTLOADER_NRFUTIL + select HAS_HIGHLEVEL_STDIO source "$(RIOTBOARD)/common/nrf52/Kconfig" diff --git a/boards/serpente/Kconfig b/boards/serpente/Kconfig index 01af3e2cad..bec12c8bdf 100644 --- a/boards/serpente/Kconfig +++ b/boards/serpente/Kconfig @@ -11,7 +11,7 @@ config BOARD_SERPENTE bool default y select CPU_MODEL_SAMD21E18A - select HAS_BOOTLOADER_ARDUINO + select HAS_HIGHLEVEL_STDIO select HAS_PERIPH_ADC select HAS_PERIPH_I2C select HAS_PERIPH_PWM diff --git a/boards/wemos-zero/Kconfig b/boards/wemos-zero/Kconfig index bd6e7e4455..82ccc05f9f 100644 --- a/boards/wemos-zero/Kconfig +++ b/boards/wemos-zero/Kconfig @@ -12,6 +12,6 @@ config BOARD_WEMOS_ZERO bool default y select BOARD_COMMON_ARDUINO_ZERO - select HAS_BOOTLOADER_ARDUINO + select HAS_HIGHLEVEL_STDIO source "$(RIOTBOARD)/common/arduino-zero/Kconfig" diff --git a/cpu/nrf5x_common/Kconfig b/cpu/nrf5x_common/Kconfig index 1e725db870..473da08d67 100644 --- a/cpu/nrf5x_common/Kconfig +++ b/cpu/nrf5x_common/Kconfig @@ -21,11 +21,6 @@ config CPU_COMMON_NRF5X select HAS_RADIO_NRFMIN ## Definition of specific features -config HAS_BOOTLOADER_NRFUTIL - bool - help - Indicates that the nRF Util bootloader is being used. - config HAS_BLE_NIMBLE bool help diff --git a/kconfigs/Kconfig.features b/kconfigs/Kconfig.features index 1ce168aebb..c0f321edbc 100644 --- a/kconfigs/Kconfig.features +++ b/kconfigs/Kconfig.features @@ -42,11 +42,6 @@ config HAS_BACKUP_RAM help Indicates that Backup RAM is supported. -config HAS_BOOTLOADER_ARDUINO - bool - help - Indicates that the Arduino bootloader is used. - config HAS_CPP bool help @@ -67,6 +62,13 @@ config HAS_ETHERNET help Indicates that Ethernet connectivity is present. +config HAS_HIGHLEVEL_STDIO + bool + help + Indicates that a high-level stdio method (such as CDC ACM) is used. + This requires a running thread and set-up and will not print during + a crash. + config HAS_LIBSTDCPP bool help