Skip to content

sys/stdio_semihosting: model in Kconfig #19651

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bors merged 4 commits into from
Jun 19, 2023
Merged

sys/stdio_semihosting: model in Kconfig #19651

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f72cb04
sys/Kconfig.stdio: model stdio_semihosting in Kconfig
aabadie May 23, 2023
a8ef65d
tests/sys/stdio_semihosting: add Kconfig config
aabadie May 23, 2023
3b505a2
pkg/tinyusb: sys: fix stdio buffered inclusion in Kconfig
aabadie Jun 17, 2023
d4b35ec
boards: fix periph_uart_hw_fc dependency resolution
aabadie Jun 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions boards/common/weact-f4x1cx/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ config BOARD_COMMON_WEACT_F4X1CX

select HAVE_SAUL_GPIO
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
default 25000000
Expand Down
6 changes: 0 additions & 6 deletions boards/common/weact-f4x1cx/Makefile.features
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,3 @@ FEATURES_PROVIDED += periph_usbdev

# Various other features (if any)
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 changes: 0 additions & 2 deletions boards/common/weact-f4x1cx/weact-f4x1cx.config
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion boards/nrf51dk/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@ config BOARD_NRF51DK

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"
4 changes: 3 additions & 1 deletion boards/nrf51dk/Makefile.dep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ ifneq (,$(filter saul_default,$(USEMODULE)))
USEMODULE += saul_gpio
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
2 changes: 1 addition & 1 deletion boards/nrf51dongle/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +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
select MODULE_PERIPH_UART_HW_FC if HAS_PERIPH_UART_HW_FC && MODULE_PERIPH_UART

source "$(RIOTBOARD)/common/nrf51/Kconfig"
5 changes: 4 additions & 1 deletion boards/nrf51dongle/Makefile.dep
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion boards/particle-argon/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ config BOARD_PARTICLE_ARGON
bool
default y
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"
2 changes: 1 addition & 1 deletion boards/particle-boron/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ config BOARD_PARTICLE_BORON
bool
default y
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"
2 changes: 1 addition & 1 deletion boards/stm32f723e-disco/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ config BOARD_STM32F723E_DISCO

select HAVE_SAUL_GPIO
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
select MODULE_STDIN if TEST_KCONFIG

Expand Down
2 changes: 1 addition & 1 deletion boards/stm32f723e-disco/Makefile.dep
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ifneq (,$(filter periph_uart,$(USEMODULE)))
USEMODULE += periph_uart_hw_fc
FEATURES_REQUIRED += periph_uart_hw_fc
endif

ifneq (,$(filter saul_default,$(USEMODULE)))
Expand Down
2 changes: 1 addition & 1 deletion boards/stm32l496g-disco/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ config BOARD_STM32L496G_DISCO
select HAVE_FT5X06

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"

Expand Down
2 changes: 1 addition & 1 deletion boards/stm32l496g-disco/Makefile.dep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ ifneq (,$(filter periph_uart,$(USEMODULE)))
USEMODULE += periph_lpuart
ifeq (,$(filter periph_spi_stmod_plus,$(USEMODULE)))
# 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
2 changes: 1 addition & 1 deletion boards/ublox-c030-u201/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ config BOARD_UBLOX_C030_U201
select BOARD_HAS_LSE

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
default 12000000
Expand Down
5 changes: 4 additions & 1 deletion boards/ublox-c030-u201/Makefile.dep
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)))
USEMODULE += saul_gpio
Expand Down
1 change: 1 addition & 0 deletions pkg/tinyusb/cdc_acm_stdio/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,6 @@ config MODULE_STDIO_TINYUSB_CDC_ACM
depends on MODULE_TINYUSB_DEVICE
depends on MODULE_TINYUSB_CLASS_CDC
select MODULE_STDIO_AVAILABLE
select USE_STDOUT_BUFFERED

endchoice
2 changes: 1 addition & 1 deletion sys/Kconfig.picolibc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

if MODULE_PICOLIBC

config PICOLIBC_STDOUT_BUFFERED
config MODULE_PICOLIBC_STDOUT_BUFFERED
bool "Buffered standard output"
default USE_STDOUT_BUFFERED
help
Expand Down
7 changes: 7 additions & 0 deletions sys/Kconfig.stdio
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,13 @@ config MODULE_STDIO_RTT
select MODULE_ZTIMER
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
bool "SLIP network device"
depends on MODULE_SLIPDEV
Expand Down
2 changes: 2 additions & 0 deletions sys/usb/usbus/cdc/acm/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,5 +61,7 @@ config MODULE_STDIO_CDC_ACM
depends on MODULE_USBUS_CDC_ACM && !MODULE_TINYUSB_DEVICE
select MODULE_ISRPIPE
select MODULE_STDIO_AVAILABLE
select USE_STDOUT_BUFFERED


endchoice
5 changes: 5 additions & 0 deletions tests/sys/stdio_semihosting/app.config.test
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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