riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

sys/ztimer: move dependencies to sys/ztimer/Makefile.dep

Browse Source
This commit is contained in:
Kaspar Schleiser 2020-02-20 11:51:06 +01:00
parent f49e756436
commit 8c1e577a06
2 changed files with 53 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
Makefile.dep
View File

@ -676,20 +676,13 @@ ifneq (,$(filter arduino_pwm,$(FEATURES_USED)))
endif endif
ifneq (,$(filter xtimer,$(USEMODULE))) ifneq (,$(filter xtimer,$(USEMODULE)))
ifeq (,$(filter ztimer,$(USEMODULE))) ifeq (,$(filter ztimer_xtimer_compat,$(USEMODULE)))
DEFAULT_MODULE += auto_init_xtimer DEFAULT_MODULE += auto_init_xtimer
FEATURES_REQUIRED += periph_timer FEATURES_REQUIRED += periph_timer
USEMODULE += div USEMODULE += div
else
USEMODULE += ztimer_xtimer_compat
endif endif
endif endif
ifneq (,$(filter ztimer_xtimer_compat,$(USEMODULE)))
USEMODULE += div
PSEUDOMODULES += xtimer
endif
ifneq (,$(filter saul,$(USEMODULE))) ifneq (,$(filter saul,$(USEMODULE)))
USEMODULE += phydat USEMODULE += phydat
endif endif
@ -1022,49 +1015,8 @@ ifneq (,$(filter periph_uart_nonblocking,$(USEMODULE)))
FEATURES_REQUIRED += periph_uart FEATURES_REQUIRED += periph_uart
endif endif
# ifneq (,$(filter ztimer%,$(USEMODULE)))
# ztimer dependencies include $(RIOTBASE)/sys/ztimer/Makefile.dep
#
ifneq (,$(filter ztimer_xtimer_compat,$(USEMODULE)))
USEMODULE += ztimer_usec
endif
ifneq (,$(filter ztimer_%,$(USEMODULE)))
USEMODULE += ztimer_core
USEMODULE += ztimer_extend
endif
ifneq (,$(filter ztimer_convert_%,$(USEMODULE)))
USEMODULE += ztimer_convert
endif
ifneq (,$(filter ztimer_periph,$(USEMODULE)))
FEATURES_REQUIRED += periph_timer
endif
ifneq (,$(filter ztimer_rtt,$(USEMODULE)))
FEATURES_REQUIRED += periph_rtt
endif
ifneq (,$(filter ztimer_convert_frac,$(USEMODULE)))
USEMODULE += frac
endif
ifneq (,$(filter ztimer,$(USEMODULE)))
# this is the default module for ztimer
USEMODULE += ztimer_auto_init
USEMODULE += ztimer_core
USEMODULE += ztimer_convert_frac
USEMODULE += ztimer_convert_shift
endif
ifneq (,$(filter ztimer_usec,$(USEMODULE)))
USEMODULE += ztimer
USEMODULE += ztimer_periph
endif
ifneq (,$(filter ztimer_msec,$(USEMODULE)))
USEMODULE += ztimer
endif endif
# Enable periph_gpio when periph_gpio_irq is enabled # Enable periph_gpio when periph_gpio_irq is enabled

50
sys/ztimer/Makefile.dep Normal file
View File

@ -0,0 +1,50 @@
#
# ztimer dependencies
#
# "ztimer" is the default meta-module of ztimer
ifneq (,$(filter ztimer,$(USEMODULE)))
USEMODULE += ztimer_auto_init
USEMODULE += ztimer_core
USEMODULE += ztimer_convert_frac
USEMODULE += ztimer_convert_shift
endif
# "ztimer_xtimer_compat" is a wrapper of the xtimer API on ztimer_used
# (it is currently incomplete)
ifneq (,$(filter ztimer_xtimer_compat,$(USEMODULE)))
USEMODULE += div
USEMODULE += ztimer_usec
PSEUDOMODULES += xtimer
endif
ifneq (,$(filter ztimer_%,$(USEMODULE)))
USEMODULE += ztimer_core
USEMODULE += ztimer_extend
endif
ifneq (,$(filter ztimer_convert_%,$(USEMODULE)))
USEMODULE += ztimer_convert
endif
ifneq (,$(filter ztimer_periph,$(USEMODULE)))
FEATURES_REQUIRED += periph_timer
endif
ifneq (,$(filter ztimer_rtt,$(USEMODULE)))
FEATURES_REQUIRED += periph_rtt
endif
ifneq (,$(filter ztimer_convert_frac,$(USEMODULE)))
USEMODULE += frac
endif
ifneq (,$(filter ztimer_usec,$(USEMODULE)))
USEMODULE += ztimer
USEMODULE += ztimer_periph
endif
ifneq (,$(filter ztimer_msec,$(USEMODULE)))
USEMODULE += ztimer
endif