RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

Merge #19651

Browse Source 
19651: sys/stdio_semihosting: model in Kconfig r=MrKevinWeiss a=aabadie



Co-authored-by: Alexandre Abadie <alexandre.abadie@inria.fr>
This commit is contained in:
bors[bot] 2023-06-19 07:07:59 +00:00 committed by GitHub
commit ef82aa6acc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
20 changed files with 38 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
boards/common/weact-f4x1cx/Kconfig
View File

@ -24,6 +24,8 @@ config BOARD_COMMON_WEACT_F4X1CX
select HAVE_SAUL_GPIO select HAVE_SAUL_GPIO
select HAVE_MTD_SPI_NOR select HAVE_MTD_SPI_NOR
select MODULE_BOOTLOADER_STM32 if MODULE_STDIO_CDC_ACM
select MODULE_USB_BOARD_RESET if KCONFIG_USB && TEST_KCONFIG
config CLOCK_HSE config CLOCK_HSE
default 25000000 default 25000000

6
boards/common/weact-f4x1cx/Makefile.features
View File

@ -12,9 +12,3 @@ FEATURES_PROVIDED += periph_usbdev
# Various other features (if any) # Various other features (if any)
FEATURES_PROVIDED += highlevel_stdio FEATURES_PROVIDED += highlevel_stdio
# This configuration enables modules that are only available when using Kconfig
# module modelling
ifeq (1, $(TEST_KCONFIG))
KCONFIG_BOARD_CONFIG += $(RIOTBOARD)/common/weact-f4x1cx/weact-f4x1cx.config
endif

2
boards/common/weact-f4x1cx/weact-f4x1cx.config
View File

@ -1,2 +0,0 @@
CONFIG_MODULE_BOOTLOADER_STM32=y
CONFIG_MODULE_USB_BOARD_RESET=y

2
boards/nrf51dk/Kconfig
View File

@ -20,6 +20,6 @@ config BOARD_NRF51DK
select HAVE_SAUL_GPIO select HAVE_SAUL_GPIO
select MODULE_PERIPH_UART_HW_FC if TEST_KCONFIG && HAS_PERIPH_UART_HW_FC select MODULE_PERIPH_UART_HW_FC if HAS_PERIPH_UART_HW_FC && MODULE_PERIPH_UART
source "$(RIOTBOARD)/common/nrf51/Kconfig" source "$(RIOTBOARD)/common/nrf51/Kconfig"

4
boards/nrf51dk/Makefile.dep
View File

@ -2,6 +2,8 @@ ifneq (,$(filter saul_default,$(USEMODULE)))
USEMODULE += saul_gpio USEMODULE += saul_gpio
endif endif
FEATURES_REQUIRED += periph_uart_hw_fc ifneq (,$(filter periph_uart,$(USEMODULE)))
FEATURES_REQUIRED += periph_uart_hw_fc
endif
include $(RIOTBOARD)/common/nrf51/Makefile.dep include $(RIOTBOARD)/common/nrf51/Makefile.dep

2
boards/nrf51dongle/Kconfig
View File

@ -15,6 +15,6 @@ config BOARD_NRF51DONGLE
select HAS_PERIPH_UART select HAS_PERIPH_UART
select HAS_PERIPH_UART_HW_FC select HAS_PERIPH_UART_HW_FC
select MODULE_PERIPH_UART_HW_FC if TEST_KCONFIG && HAS_PERIPH_UART_HW_FC select MODULE_PERIPH_UART_HW_FC if HAS_PERIPH_UART_HW_FC && MODULE_PERIPH_UART
source "$(RIOTBOARD)/common/nrf51/Kconfig" source "$(RIOTBOARD)/common/nrf51/Kconfig"

5
boards/nrf51dongle/Makefile.dep
View File

@ -1,3 +1,6 @@
FEATURES_REQUIRED += periph_uart_hw_fc
ifneq (,$(filter periph_uart,$(USEMODULE)))
FEATURES_REQUIRED += periph_uart_hw_fc
endif
include $(RIOTBOARD)/common/nrf51/Makefile.dep include $(RIOTBOARD)/common/nrf51/Makefile.dep

2
boards/particle-argon/Kconfig
View File

@ -11,6 +11,6 @@ config BOARD_PARTICLE_ARGON
bool bool
default y default y
select BOARD_COMMON_PARTICLE_MESH select BOARD_COMMON_PARTICLE_MESH
select MODULE_PERIPH_UART_HW_FC if TEST_KCONFIG && HAS_PERIPH_UART_HW_FC && MODULE_PERIPH_UART select MODULE_PERIPH_UART_HW_FC if HAS_PERIPH_UART_HW_FC && MODULE_PERIPH_UART
source "$(RIOTBOARD)/common/particle-mesh/Kconfig" source "$(RIOTBOARD)/common/particle-mesh/Kconfig"

2
boards/particle-boron/Kconfig
View File

@ -11,6 +11,6 @@ config BOARD_PARTICLE_BORON
bool bool
default y default y
select BOARD_COMMON_PARTICLE_MESH select BOARD_COMMON_PARTICLE_MESH
select MODULE_PERIPH_UART_HW_FC if TEST_KCONFIG && HAS_PERIPH_UART_HW_FC && MODULE_PERIPH_UART select MODULE_PERIPH_UART_HW_FC if HAS_PERIPH_UART_HW_FC && MODULE_PERIPH_UART
source "$(RIOTBOARD)/common/particle-mesh/Kconfig" source "$(RIOTBOARD)/common/particle-mesh/Kconfig"

2
boards/stm32f723e-disco/Kconfig
View File

@ -34,7 +34,7 @@ config BOARD_STM32F723E_DISCO
select HAVE_SAUL_GPIO select HAVE_SAUL_GPIO
select HAVE_FT5X06 select HAVE_FT5X06
select MODULE_PERIPH_UART_HW_FC if TEST_KCONFIG && HAS_PERIPH_UART_HW_FC && MODULE_PERIPH_UART select MODULE_PERIPH_UART_HW_FC if HAS_PERIPH_UART_HW_FC && MODULE_PERIPH_UART
# Workaround due to stdout only working with stdin enabled # Workaround due to stdout only working with stdin enabled
select MODULE_STDIN if TEST_KCONFIG select MODULE_STDIN if TEST_KCONFIG

2
boards/stm32f723e-disco/Makefile.dep
View File

@ -1,5 +1,5 @@
ifneq (,$(filter periph_uart,$(USEMODULE))) ifneq (,$(filter periph_uart,$(USEMODULE)))
USEMODULE += periph_uart_hw_fc FEATURES_REQUIRED += periph_uart_hw_fc
endif endif
ifneq (,$(filter saul_default,$(USEMODULE))) ifneq (,$(filter saul_default,$(USEMODULE)))

2
boards/stm32l496g-disco/Kconfig
View File

@ -41,7 +41,7 @@ config BOARD_STM32L496G_DISCO
select HAVE_FT5X06 select HAVE_FT5X06
select MODULE_PERIPH_LPUART if MODULE_PERIPH_UART select MODULE_PERIPH_LPUART if MODULE_PERIPH_UART
select MODULE_PERIPH_UART_HW_FC if MODULE_PERIPH_UART && !MODULE_PERIPH_SPI_STMOD select MODULE_PERIPH_UART_HW_FC if MODULE_PERIPH_UART && !MODULE_PERIPH_SPI_STMOD && HAS_PERIPH_UART_HW_FC
source "$(RIOTBOARD)/common/stm32/Kconfig" source "$(RIOTBOARD)/common/stm32/Kconfig"

2
boards/stm32l496g-disco/Makefile.dep
View File

@ -14,6 +14,6 @@ ifneq (,$(filter periph_uart,$(USEMODULE)))
USEMODULE += periph_lpuart USEMODULE += periph_lpuart
ifeq (,$(filter periph_spi_stmod_plus,$(USEMODULE))) ifeq (,$(filter periph_spi_stmod_plus,$(USEMODULE)))
# if STMod+ is not used with SPI (default), the UART interface uses HW FC # if STMod+ is not used with SPI (default), the UART interface uses HW FC
USEMODULE += periph_uart_hw_fc FEATURES_REQUIRED += periph_uart_hw_fc
endif endif
endif endif

2
boards/ublox-c030-u201/Kconfig
View File

@ -28,7 +28,7 @@ config BOARD_UBLOX_C030_U201
select BOARD_HAS_LSE select BOARD_HAS_LSE
select HAVE_SAUL_GPIO select HAVE_SAUL_GPIO
select MODULE_PERIPH_UART_HW_FC if TEST_KCONFIG && HAS_PERIPH_UART_HW_FC select MODULE_PERIPH_UART_HW_FC if HAS_PERIPH_UART_HW_FC && MODULE_PERIPH_UART
config CLOCK_HSE config CLOCK_HSE
default 12000000 default 12000000

5
boards/ublox-c030-u201/Makefile.dep
View File

@ -1,4 +1,7 @@
USEMODULE += periph_uart_hw_fc ifneq (,$(filter periph_uart,$(USEMODULE)))
FEATURES_REQUIRED += periph_uart_hw_fc
endif
ifneq (,$(filter saul_default,$(USEMODULE))) ifneq (,$(filter saul_default,$(USEMODULE)))
USEMODULE += saul_gpio USEMODULE += saul_gpio

1
pkg/tinyusb/cdc_acm_stdio/Kconfig
View File

@ -14,5 +14,6 @@ config MODULE_STDIO_TINYUSB_CDC_ACM
depends on MODULE_TINYUSB_DEVICE depends on MODULE_TINYUSB_DEVICE
depends on MODULE_TINYUSB_CLASS_CDC depends on MODULE_TINYUSB_CLASS_CDC
select MODULE_STDIO_AVAILABLE select MODULE_STDIO_AVAILABLE
select USE_STDOUT_BUFFERED
endchoice endchoice

2
sys/Kconfig.picolibc
View File

@ -7,7 +7,7 @@
if MODULE_PICOLIBC if MODULE_PICOLIBC
config PICOLIBC_STDOUT_BUFFERED config MODULE_PICOLIBC_STDOUT_BUFFERED
bool "Buffered standard output" bool "Buffered standard output"
default USE_STDOUT_BUFFERED default USE_STDOUT_BUFFERED
help help

7
sys/Kconfig.stdio
View File

@ -29,6 +29,13 @@ config MODULE_STDIO_RTT
select MODULE_ZTIMER select MODULE_ZTIMER
select MODULE_ZTIMER_MSEC select MODULE_ZTIMER_MSEC
config MODULE_STDIO_SEMIHOSTING
bool "ARM and RISC-V Semihosting"
depends on HAS_ARCH_ARM || HAS_ARCH_RISCV
select MODULE_ZTIMER
select MODULE_ZTIMER_MSEC
select USE_STDOUT_BUFFERED
config MODULE_SLIPDEV_STDIO config MODULE_SLIPDEV_STDIO
bool "SLIP network device" bool "SLIP network device"
depends on MODULE_SLIPDEV depends on MODULE_SLIPDEV

2
sys/usb/usbus/cdc/acm/Kconfig
View File

@ -61,5 +61,7 @@ config MODULE_STDIO_CDC_ACM
depends on MODULE_USBUS_CDC_ACM && !MODULE_TINYUSB_DEVICE depends on MODULE_USBUS_CDC_ACM && !MODULE_TINYUSB_DEVICE
select MODULE_ISRPIPE select MODULE_ISRPIPE
select MODULE_STDIO_AVAILABLE select MODULE_STDIO_AVAILABLE
select USE_STDOUT_BUFFERED
endchoice endchoice

5
tests/sys/stdio_semihosting/app.config.test Normal file
View File

@ -0,0 +1,5 @@
CONFIG_MODULE_STDIO_SEMIHOSTING=y
CONFIG_MODULE_SHELL=y
CONFIG_MODULE_SHELL_CMDS_DEFAULT=y
CONFIG_MODULE_PS=y
CONFIG_FORCE_USB_STDIO=n