From 6b5c75cad44f7a853802ccc1458ac1fff7561cc9 Mon Sep 17 00:00:00 2001 From: MrKevinWeiss Date: Thu, 27 Oct 2022 11:40:40 +0200 Subject: [PATCH] boards/blxxpill-128kib: Fix kconfig mismatch Nightlies are failing due to kconfig mismatch. It would seem this is a result of bringing in the USB stuff. I assume that this uses ztimer periph_timer as a backend as periph_timer is already selected. However, kconfig only resolves one and not recursively making it hard to match. For not a hack is added to override for these boards. --- boards/blackpill-128kib/Kconfig | 7 +++++++ boards/bluepill-128kib/Kconfig | 7 +++++++ sys/ztimer/Kconfig | 2 +- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/boards/blackpill-128kib/Kconfig b/boards/blackpill-128kib/Kconfig index dcf447d38c..cc5a9e80fa 100644 --- a/boards/blackpill-128kib/Kconfig +++ b/boards/blackpill-128kib/Kconfig @@ -17,4 +17,11 @@ config BOARD_BLACKPILL_128KIB 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" diff --git a/boards/bluepill-128kib/Kconfig b/boards/bluepill-128kib/Kconfig index aad5ed6edd..01c3e0ab93 100644 --- a/boards/bluepill-128kib/Kconfig +++ b/boards/bluepill-128kib/Kconfig @@ -17,4 +17,11 @@ config BOARD_BLUEPILL_128KIB 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" diff --git a/sys/ztimer/Kconfig b/sys/ztimer/Kconfig index f1ab66248e..4f8b5ab5db 100644 --- a/sys/ztimer/Kconfig +++ b/sys/ztimer/Kconfig @@ -59,7 +59,7 @@ config MODULE_ZTIMER_MSEC bool "Milliseconds" select MODULE_ZTIMER -choice +choice ZTIMER_MSEC_BACKEND bool "Backend" depends on MODULE_ZTIMER_MSEC default ZTIMER_MSEC_BACKEND_RTT if !MODULE_ZTIMER_NO_PERIPH_RTT