diff --git a/.murdock b/.murdock index 892caf058d..83e9af110c 100755 --- a/.murdock +++ b/.murdock @@ -22,6 +22,7 @@ dwm1001 hifive1 mbed_lpc1768 mega-xplained +microbit native nrf52840dk nucleo-f072rb diff --git a/boards/airfy-beacon/Kconfig b/boards/airfy-beacon/Kconfig index 8ac778c009..92569f25ce 100644 --- a/boards/airfy-beacon/Kconfig +++ b/boards/airfy-beacon/Kconfig @@ -16,5 +16,6 @@ config BOARD_AIRFY_BEACON select HAS_PERIPH_I2C select HAS_PERIPH_SPI select HAS_PERIPH_UART + select MODULE_BOARDS_COMMON_NRF51 if TEST_KCONFIG source "$(RIOTBOARD)/common/nrf51/Kconfig" diff --git a/boards/calliope-mini/Kconfig b/boards/calliope-mini/Kconfig index 9996dec406..e5ffde225b 100644 --- a/boards/calliope-mini/Kconfig +++ b/boards/calliope-mini/Kconfig @@ -16,4 +16,8 @@ config BOARD_CALLIOPE_MINI select HAS_PERIPH_UART select HAS_PERIPH_PWM + select HAVE_SAUL_GPIO + select HAVE_BMX055 + +source "$(RIOTBOARD)/common/microbit/Kconfig" source "$(RIOTBOARD)/common/nrf51/Kconfig" diff --git a/boards/calliope-mini/Makefile.dep b/boards/calliope-mini/Makefile.dep index 32bd25340e..19f37b7bc4 100644 --- a/boards/calliope-mini/Makefile.dep +++ b/boards/calliope-mini/Makefile.dep @@ -1,6 +1,6 @@ ifneq (,$(filter saul_default,$(USEMODULE))) - USEMODULE += saul_gpio USEMODULE += bmx055 endif include $(RIOTBOARD)/common/microbit/Makefile.dep +include $(RIOTBOARD)/common/nrf51/Makefile.dep diff --git a/boards/common/microbit/Kconfig b/boards/common/microbit/Kconfig new file mode 100644 index 0000000000..b518c19096 --- /dev/null +++ b/boards/common/microbit/Kconfig @@ -0,0 +1,11 @@ +# Copyright (c) 2021 Inria +# +# This file is subject to the terms and conditions of the GNU Lesser +# General Public License v2.1. See the file LICENSE in the top level +# directory for more details. + +config MODULE_MICROBIT + bool "BBC micro:bit specific LED matrix handling" + select MODULE_ZTIMER + select MODULE_ZTIMER_USEC + select MODULE_MINEPLEX diff --git a/boards/common/microbit/Makefile.dep b/boards/common/microbit/Makefile.dep index 7b743b0ee9..4273396c08 100644 --- a/boards/common/microbit/Makefile.dep +++ b/boards/common/microbit/Makefile.dep @@ -3,3 +3,7 @@ ifneq (,$(filter microbit,$(USEMODULE))) USEMODULE += ztimer_usec USEMODULE += mineplex endif + +ifneq (,$(filter saul_default,$(USEMODULE))) + USEMODULE += saul_gpio +endif diff --git a/boards/common/nrf51/Kconfig b/boards/common/nrf51/Kconfig index 9cb9a28bd9..ea63e6730f 100644 --- a/boards/common/nrf51/Kconfig +++ b/boards/common/nrf51/Kconfig @@ -8,3 +8,15 @@ config BOARD_COMMON_NRF51 bool select HAS_PERIPH_RTT select HAS_PERIPH_TIMER + + select HAVE_SAUL_NRF_TEMPERATURE + +config MODULE_BOARDS_COMMON_NRF51 + bool + depends on TEST_KCONFIG + help + Common code of NRF51 boards + +choice NRF5X_RADIO_BACKEND + default MODULE_NRFMIN +endchoice diff --git a/boards/microbit-v2/Kconfig b/boards/microbit-v2/Kconfig index 945fb13b9a..3dd82fe79c 100644 --- a/boards/microbit-v2/Kconfig +++ b/boards/microbit-v2/Kconfig @@ -18,4 +18,5 @@ config BOARD_MICROBIT_V2 select HAS_PERIPH_UART select HAS_VDD_LC_FILTER_REG1 +source "$(RIOTBOARD)/common/microbit/Kconfig" source "$(RIOTBOARD)/common/nrf52/Kconfig" diff --git a/boards/microbit-v2/Makefile.dep b/boards/microbit-v2/Makefile.dep index 64554993f0..1af3e2ed3d 100644 --- a/boards/microbit-v2/Makefile.dep +++ b/boards/microbit-v2/Makefile.dep @@ -1,6 +1,2 @@ -ifneq (,$(filter saul_default,$(USEMODULE))) - USEMODULE += saul_gpio -endif - include $(RIOTBOARD)/common/microbit/Makefile.dep include $(RIOTBOARD)/common/nrf52/Makefile.dep diff --git a/boards/microbit/Kconfig b/boards/microbit/Kconfig index 846ae7ca23..b568606f38 100644 --- a/boards/microbit/Kconfig +++ b/boards/microbit/Kconfig @@ -15,4 +15,8 @@ config BOARD_MICROBIT select HAS_PERIPH_I2C select HAS_PERIPH_UART + select HAVE_SAUL_GPIO + select HAVE_MMA8X5X + +source "$(RIOTBOARD)/common/microbit/Kconfig" source "$(RIOTBOARD)/common/nrf51/Kconfig" diff --git a/boards/microbit/Makefile.dep b/boards/microbit/Makefile.dep index 8d41eee322..f69ce02914 100644 --- a/boards/microbit/Makefile.dep +++ b/boards/microbit/Makefile.dep @@ -1,5 +1,4 @@ ifneq (,$(filter saul_default,$(USEMODULE))) - USEMODULE += saul_gpio USEMODULE += mma8x5x endif diff --git a/boards/nrf51dk/Kconfig b/boards/nrf51dk/Kconfig index 7802dde835..6cc36c9b6b 100644 --- a/boards/nrf51dk/Kconfig +++ b/boards/nrf51dk/Kconfig @@ -18,4 +18,8 @@ config BOARD_NRF51DK select HAS_PERIPH_UART_HW_FC select HAS_VDD_LC_FILTER_REG1 + select HAVE_SAUL_GPIO + + select MODULE_PERIPH_UART_HW_FC if TEST_KCONFIG && HAS_PERIPH_UART_HW_FC + source "$(RIOTBOARD)/common/nrf51/Kconfig" diff --git a/boards/nrf51dongle/Kconfig b/boards/nrf51dongle/Kconfig index 25a9d22040..367b8714c0 100644 --- a/boards/nrf51dongle/Kconfig +++ b/boards/nrf51dongle/Kconfig @@ -15,4 +15,6 @@ config BOARD_NRF51DONGLE select HAS_PERIPH_UART select HAS_PERIPH_UART_HW_FC + select MODULE_PERIPH_UART_HW_FC if TEST_KCONFIG && HAS_PERIPH_UART_HW_FC + source "$(RIOTBOARD)/common/nrf51/Kconfig" diff --git a/boards/yunjia-nrf51822/Kconfig b/boards/yunjia-nrf51822/Kconfig index 8134f739e6..9ec9f5fe00 100644 --- a/boards/yunjia-nrf51822/Kconfig +++ b/boards/yunjia-nrf51822/Kconfig @@ -16,5 +16,6 @@ config BOARD_YUNJIA_NRF51822 select HAS_PERIPH_I2C select HAS_PERIPH_SPI select HAS_PERIPH_UART + select MODULE_BOARDS_COMMON_NRF51 if TEST_KCONFIG source "$(RIOTBOARD)/common/nrf51/Kconfig" diff --git a/drivers/bmx055/Kconfig b/drivers/bmx055/Kconfig index 1fd4f8e475..8438ea70bd 100644 --- a/drivers/bmx055/Kconfig +++ b/drivers/bmx055/Kconfig @@ -52,5 +52,6 @@ endif # KCONFIG_USEMODULE_BMX055 config HAVE_BMX055 bool + select MODULE_BMX055 if MODULE_SAUL_DEFAULT help Indicates that a BMX055 9-axis sensor is present. diff --git a/drivers/mma8x5x/Kconfig b/drivers/mma8x5x/Kconfig index 01ba402447..2fd273523a 100644 --- a/drivers/mma8x5x/Kconfig +++ b/drivers/mma8x5x/Kconfig @@ -32,3 +32,9 @@ config MMA8X5X_I2C_ADDRESS Default value corresponds to SA0 connected to VCC. endif # KCONFIG_USEMODULE_MMA8X5X + +config HAVE_MMA8X5X + bool + select MODULE_MMA8X5X if MODULE_SAUL_DEFAULT + help + Indicates that a MMA8x5x is present diff --git a/drivers/periph_common/Kconfig.uart b/drivers/periph_common/Kconfig.uart index 8e5402f3fc..cda9306a33 100644 --- a/drivers/periph_common/Kconfig.uart +++ b/drivers/periph_common/Kconfig.uart @@ -51,4 +51,13 @@ config MODULE_PERIPH_INIT_LPUART depends on MODULE_PERIPH_LPUART default y if MODULE_PERIPH_INIT +config MODULE_PERIPH_UART_HW_FC + bool + depends on HAS_PERIPH_UART_HW_FC + +config MODULE_PERIPH_INIT_UART_HW_FC + bool + depends on MODULE_PERIPH_UART_HW_FC + default y if MODULE_PERIPH_INIT + endif # MODULE_PERIPH_UART diff --git a/examples/asymcute_mqttsn/Makefile.ci b/examples/asymcute_mqttsn/Makefile.ci index f16c8ad78d..173809e219 100644 --- a/examples/asymcute_mqttsn/Makefile.ci +++ b/examples/asymcute_mqttsn/Makefile.ci @@ -10,6 +10,7 @@ BOARD_INSUFFICIENT_MEMORY := \ atmega328p-xplained-mini \ atxmega-a3bu-xplained \ bluepill-stm32f030c8 \ + calliope-mini \ derfmega128 \ hifive1 \ hifive1b \ diff --git a/examples/dtls-wolfssl/Makefile.ci b/examples/dtls-wolfssl/Makefile.ci index 007c7c145d..bcbafc76bc 100644 --- a/examples/dtls-wolfssl/Makefile.ci +++ b/examples/dtls-wolfssl/Makefile.ci @@ -7,6 +7,7 @@ BOARD_INSUFFICIENT_MEMORY := \ calliope-mini \ cc2650-launchpad \ cc2650stk \ + calliope-mini \ hifive1 \ i-nucleo-lrwan1 \ im880b \ diff --git a/examples/gcoap_dtls/Makefile.ci b/examples/gcoap_dtls/Makefile.ci index 3826349f94..0fd62e96b7 100644 --- a/examples/gcoap_dtls/Makefile.ci +++ b/examples/gcoap_dtls/Makefile.ci @@ -12,6 +12,7 @@ BOARD_INSUFFICIENT_MEMORY := \ blackpill \ bluepill \ bluepill-stm32f030c8 \ + calliope-mini \ derfmega128 \ hifive1 \ hifive1b \ diff --git a/tests/Makefile.boards.netif b/tests/Makefile.boards.netif index bb32bb9ea8..6dfcb2ea97 100644 --- a/tests/Makefile.boards.netif +++ b/tests/Makefile.boards.netif @@ -7,6 +7,7 @@ BOARD_PROVIDES_NETIF := \ avr-rss2 \ b-l072z-lrwan1 \ cc2538dk \ + calliope-mini \ derfmega128 \ derfmega256 \ dwm1001 \ diff --git a/tests/board_calliope-mini/Makefile b/tests/board_calliope-mini/Makefile deleted file mode 100644 index efec785ad5..0000000000 --- a/tests/board_calliope-mini/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -BOARD ?= calliope-mini -include ../Makefile.tests_common - -# This test application is for the Calliope mini only -BOARD_WHITELIST := calliope-mini - -# We want to test the Calliope mini support module -USEMODULE += microbit - -include $(RIOTBASE)/Makefile.include diff --git a/tests/board_calliope-mini/README.md b/tests/board_calliope-mini/README.md deleted file mode 100644 index 57c8b043f1..0000000000 --- a/tests/board_calliope-mini/README.md +++ /dev/null @@ -1,13 +0,0 @@ -Background -========== -The Calliope mini board comes with its own little utility library, that makes -some of the boards unique feature like the 5x5 LED matrix usable to RIOT. - -This test application is therefore specialized for only that board and its -purpose is to test and showcase the board specific utility library. - - -Expected result -=============== -When running this application, you should see the string -`Welcome RIOT @ Calliope mini!` scrolling by on the boards LED matrix. diff --git a/tests/board_calliope-mini/main.c b/tests/board_calliope-mini/main.c deleted file mode 100644 index f1fd230950..0000000000 --- a/tests/board_calliope-mini/main.c +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright (C) 2016 Freie Universität Berlin - * - * This file is subject to the terms and conditions of the GNU Lesser - * General Public License v2.1. See the file LICENSE in the top level - * directory for more details. - */ - -/** - * @ingroup tests - * @{ - * - * @file - * @brief Test the Calliope mini support library - * - * @author Hauke Petersen - * - * @} - */ - -#include - -#include "timex.h" -#include "microbit.h" - -#define DELAY (120 * US_PER_MS) - -int main(void) -{ - puts("Welcome to RIOT!\n"); - puts("Please refer to the README.md for more information about this app\n"); - - microbit_matrix_init(); - - while (1) { - microbit_matrix_shift_str("Welcome RIOT @ Calliope mini!", DELAY); - } - - return 0; -} diff --git a/tests/board_microbit/Makefile b/tests/board_microbit/Makefile index bd9b8a08b2..8f543229c9 100644 --- a/tests/board_microbit/Makefile +++ b/tests/board_microbit/Makefile @@ -3,7 +3,7 @@ BOARD ?= microbit include ../Makefile.tests_common # This test application is for the BBC micro:bit only -BOARD_WHITELIST := microbit microbit-v2 +BOARD_WHITELIST := microbit microbit-v2 calliope-mini # We want to test the microbit support module USEMODULE += microbit diff --git a/tests/board_microbit/app.config.test b/tests/board_microbit/app.config.test new file mode 100644 index 0000000000..a17624a78b --- /dev/null +++ b/tests/board_microbit/app.config.test @@ -0,0 +1,3 @@ +# this file enables modules defined in Kconfig. Do not use this file for +# application configuration. This is only needed during migration. +CONFIG_MODULE_MICROBIT=y diff --git a/tests/gnrc_dhcpv6_client_stateless/Makefile.ci b/tests/gnrc_dhcpv6_client_stateless/Makefile.ci index 4c69208410..70b3c70e98 100644 --- a/tests/gnrc_dhcpv6_client_stateless/Makefile.ci +++ b/tests/gnrc_dhcpv6_client_stateless/Makefile.ci @@ -12,6 +12,7 @@ BOARD_INSUFFICIENT_MEMORY := \ atxmega-a3bu-xplained \ b-l072z-lrwan1 \ bluepill-stm32f030c8 \ + calliope-mini \ derfmega128 \ hifive1 \ hifive1b \ diff --git a/tests/saul/app.config.test b/tests/saul/app.config.test new file mode 100644 index 0000000000..88777efd99 --- /dev/null +++ b/tests/saul/app.config.test @@ -0,0 +1,3 @@ +CONFIG_MODULE_SAUL_DEFAULT=y +CONFIG_MODULE_SAUL=y +CONFIG_MODULE_XTIMER=y diff --git a/tests/thread_float/Makefile.ci b/tests/thread_float/Makefile.ci index 70bff42a2e..93abb1f16c 100644 --- a/tests/thread_float/Makefile.ci +++ b/tests/thread_float/Makefile.ci @@ -6,6 +6,7 @@ BOARD_INSUFFICIENT_MEMORY := \ arduino-uno \ atmega328p \ atmega328p-xplained-mini \ + calliope-mini \ cc2650stk \ maple-mini \ mbed_lpc1768 \