kaspar/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-12-17 02:23:49 +01:00
Code Releases Activity

Merge pull request #18805 from MrKevinWeiss/pr/fix/nightlybpfail

Browse Source 
Fix kconfig mismatch breaking nightlies
This commit is contained in:
benpicco 2022-10-27 18:18:17 +02:00 committed by GitHub
commit 1481df8a31
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
boards/blackpill-128kib/Kconfig
View File

@ -17,4 +17,11 @@ config BOARD_BLACKPILL_128KIB
select HAS_HIGHLEVEL_STDIO select HAS_HIGHLEVEL_STDIO
# HACK: This is added due to the make resolution
# make will select timer backend, probably due to the USBUS
# and kconfig cannot select if something is already selected like make
choice ZTIMER_MSEC_BACKEND
default ZTIMER_MSEC_BACKEND_TIMER if MODULE_PERIPH_RTC
endchoice
source "$(RIOTBOARD)/common/blxxxpill/Kconfig" source "$(RIOTBOARD)/common/blxxxpill/Kconfig"

7
boards/bluepill-128kib/Kconfig
View File

@ -17,4 +17,11 @@ config BOARD_BLUEPILL_128KIB
select HAS_HIGHLEVEL_STDIO select HAS_HIGHLEVEL_STDIO
# HACK: This is added due to the make resolution
# make will select timer backend, probably due to the USBUS
# and kconfig cannot select if something is already selected like make
choice ZTIMER_MSEC_BACKEND
default ZTIMER_MSEC_BACKEND_TIMER if MODULE_PERIPH_RTC
endchoice
source "$(RIOTBOARD)/common/blxxxpill/Kconfig" source "$(RIOTBOARD)/common/blxxxpill/Kconfig"

2
sys/ztimer/Kconfig
View File

@ -59,7 +59,7 @@ config MODULE_ZTIMER_MSEC
bool "Milliseconds" bool "Milliseconds"
select MODULE_ZTIMER select MODULE_ZTIMER
choice choice ZTIMER_MSEC_BACKEND
bool "Backend" bool "Backend"
depends on MODULE_ZTIMER_MSEC depends on MODULE_ZTIMER_MSEC
default ZTIMER_MSEC_BACKEND_RTT if !MODULE_ZTIMER_NO_PERIPH_RTT default ZTIMER_MSEC_BACKEND_RTT if !MODULE_ZTIMER_NO_PERIPH_RTT