Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

sys/ztimer/kconfig: enable xtimer compat only with timer backend #17307

Conversation

leandrolanzieri
Copy link
Contributor

Contribution description

While testing #17235 I came across a discrepancy between when Makefile.dep enables xtimer compatibility modules and when Kconfig does it. Kconfig would enable compatibility whenever xtimer and ztimer are active, but Makefile.dep checks in addition that the timer peripheral backend is enabled. This PR adds this condition to the Kconfig choice. To avoid a loop on the selection of MODULE_ZTIMER_PERIPH_TIMER, this also moves its selection from MODULE_ZTIMER_USEC to the visible symbol ZTIMER_USEC.

Testing procedure

  • Green CI
  • Check that the behaviour matches the one in Makefile.dep.

Issues/PRs references

#17235

@leandrolanzieri leandrolanzieri added the Type: bug The issue reports a bug / The PR fixes a bug (including spelling errors) label Dec 1, 2021
@leandrolanzieri leandrolanzieri added this to the Release 2022.01 milestone Dec 1, 2021
@github-actions github-actions bot added Area: arduino API Area: Arduino wrapper API Area: boards Area: Board ports Area: drivers Area: Device drivers Area: Kconfig Area: Kconfig integration Area: pkg Area: External package ports Area: sys Area: System Area: timers Area: timer subsystems labels Dec 1, 2021
Copy link
Contributor

@fjmolinas fjmolinas left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK

[CTF] Kconfig migration - Model of module dependencies automation moved this from In progress to Reviewer approved Dec 2, 2021
@fjmolinas fjmolinas added the CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR label Dec 2, 2021
@leandrolanzieri
Copy link
Contributor Author

#17317 is merged, it needs probably an update

@leandrolanzieri leandrolanzieri force-pushed the pr/sys/ztimer/kconfig/fix_compat_deps branch from b9a0b78 to 004da59 Compare December 2, 2021 08:35
@leandrolanzieri
Copy link
Contributor Author

There, updated the select of the benchmark module

This also moves the selection of MODULE_ZTIMER_PERIPH_TIMER from
MODULE_ZTIMER_USEC to the visible symbol ZTIMER_USEC.
@fjmolinas
Copy link
Contributor

ACK still stands

@fjmolinas fjmolinas merged commit 662aba4 into RIOT-OS:master Dec 2, 2021
[CTF] Kconfig migration - Model of module dependencies automation moved this from Reviewer approved to Done Dec 2, 2021
@leandrolanzieri leandrolanzieri deleted the pr/sys/ztimer/kconfig/fix_compat_deps branch December 2, 2021 13:55
@leandrolanzieri
Copy link
Contributor Author

Thanks for reviewing!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Area: arduino API Area: Arduino wrapper API Area: boards Area: Board ports Area: drivers Area: Device drivers Area: Kconfig Area: Kconfig integration Area: pkg Area: External package ports Area: sys Area: System Area: timers Area: timer subsystems CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR Type: bug The issue reports a bug / The PR fixes a bug (including spelling errors)
Development

Successfully merging this pull request may close these issues.

None yet

2 participants