Skip to content

Commit ae0bf90

Browse files
committed
fixup! sys/ztimer: add 'ztimer_periph_rtt_auto_select'
1 parent b35229c commit ae0bf90

3 files changed

Lines changed: 5 additions & 5 deletions

File tree

makefiles/defaultmodules.inc.mk

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@ DEFAULT_MODULE += auto_init
55
# Initialize all used peripherals by default
66
DEFAULT_MODULE += periph_init
77

8+
# If ztimer is used enable rtt autoselection for ztimer_msec, and ztimer_sec.
9+
# This will enable inclusion of `ztimer_periph_rtt` if `periph_rtt` is supported.
10+
DEFAULT_MODULE += ztimer_periph_rtt_auto_select
11+
812
# Include potentially added default modules by the board
913
-include $(BOARDDIR)/Makefile.default
1014

sys/Makefile.dep

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -746,7 +746,7 @@ ifneq (,$(filter test_utils_result_output_%,$(USEMODULE)))
746746
endif
747747

748748
# include ztimer dependencies
749-
ifneq (,$(filter ztimer% %ztimer,$(USEMODULE)))
749+
ifneq (,$(filter-out ztimer_periph_rtt_auto_selec,$(filter ztimer% %ztimer,$(USEMODULE))))
750750
include $(RIOTBASE)/sys/ztimer/Makefile.dep
751751
endif
752752

sys/ztimer/Makefile.dep

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@ ifneq (,$(filter ztimer,$(USEMODULE)))
88
USEMODULE += ztimer_convert_frac
99
USEMODULE += ztimer_convert_shift
1010

11-
# If ztimer is used enable rtt autoselection for ztimer_msec, and ztimer_sec.
12-
# This will enable inclusion of `ztimer_periph_rtt` if `periph_rtt` is supported.
13-
DEFAULT_MODULE += ztimer_periph_rtt_auto_select
14-
1511
# ztimer's auto_init code resides in it's submodule "ztimer_auto_init",
1612
# but RIOT's auto_init scheme expects "auto_init_ztimer" in DEFAULT_MODULES so
1713
# it can be disabled (by adding to DISABLE_MODULES).

0 commit comments

Comments
 (0)