From 5393c7571a2a77804174785a36d4700ecd4e3067 Mon Sep 17 00:00:00 2001 From: Gunar Schorcht Date: Fri, 29 Sep 2023 07:48:32 +0200 Subject: [PATCH] drivers/sdmmc: fix dependencies for ztimer_msec Enabling `ztimer_msec` through `sdmmc` in case `ztimer_usec` is not enabled will not work if the dependencies for `sdmmc` are resolved before the dependencies of another module that enables `ztimer_usec`. Therefore, `ztimer_msec` has to be enabled by `sdmmc` --- drivers/sdmmc/Kconfig | 2 +- drivers/sdmmc/Makefile.dep | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/sdmmc/Kconfig b/drivers/sdmmc/Kconfig index 69277ad7c7..4b9efa06f8 100644 --- a/drivers/sdmmc/Kconfig +++ b/drivers/sdmmc/Kconfig @@ -9,7 +9,7 @@ config MODULE_SDMMC bool "SDIO/SD/MMC interface" depends on HAS_PERIPH_SDMMC select MODULE_PERIPH_SDMMC - select MODULE_ZTIMER_MSEC if !ZTIMER_USEC + select MODULE_ZTIMER_MSEC if MODULE_SDMMC diff --git a/drivers/sdmmc/Makefile.dep b/drivers/sdmmc/Makefile.dep index e0984f9265..c5f1d53413 100644 --- a/drivers/sdmmc/Makefile.dep +++ b/drivers/sdmmc/Makefile.dep @@ -11,7 +11,4 @@ ifneq (,$(filter sdmmc_sdhc,$(USEMODULE))) FEATURES_REQUIRED += periph_sdmmc_sdhc endif -ifeq (,$(filter ztimer_usec,$(USEMODULE))) - # enable ztimer_msec backend if ztimer_usec is not enabled - USEMODULE += ztimer_msec -endif +USEMODULE += ztimer_msec