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

cpu/kinetis/Makefile.features: Use CPU_MODEL to determine features #12861

Merged
merged 1 commit into from
Dec 2, 2019

Conversation

leandrolanzieri
Copy link
Contributor

Contribution description

Now that CPU and CPU_MODEL are defined in the board's Makefile.features they can be used to determine the available features provided by the specific model.

This PR also fixes a check introduced in #9666. As KINETIS_SERIES is defined in kinetis-info.mk, which is included after, periph_ics would never be included as a feature.

Testing procedure

  • Check that the provided for kinetis-based boards still the same. E.g.:
BOARD=frdm-kw41z make info-debug-variable-FEATURES_PROVIDED -C examples/hello-world

Issues/PRs references

Fixes check introduced in #9666
Removes hack added in #11479

Now that CPU and CPU_MODEL are defined in the board's Makefile.features
it can be used to determine the available features provided by the
specific model.
@leandrolanzieri leandrolanzieri added Type: bug The issue reports a bug / The PR fixes a bug (including spelling errors) Type: cleanup The issue proposes a clean-up / The PR cleans-up parts of the codebase / documentation Area: cpu Area: CPU/MCU ports labels Dec 2, 2019
@leandrolanzieri leandrolanzieri 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, 2019
@fjmolinas
Copy link
Contributor

FEATURES_PROVIDED for kinetis boards is still the same:

for board in frdm-kw41z phynode-kw41z usb-kw41z teensy31 frdm-k22f frdm-k64f; do BOARD=${board} make --no-print-directory -C examples/hello-world/ info-debug-variable-BOARD info-debug-variable-FEATURES_PROVIDED; done > pr.txt; git checkout upstream/master; for board in frdm-kw41z phynode-kw41z usb-kw41z teensy31 frdm-k22f frdm-k64f; do BOARD=${board} make --no-print-directory -C examples/hello-world/ info-debug-variable-BOARD info-debug-variable-FEATURES_PROVIDED; done > master.txt; diff pr.txt master.txt; git checkout pr-12681
#no diff

@fjmolinas
Copy link
Contributor

fjmolinas commented Dec 2, 2019

No board of EA series is currently supported so set CPU_MODEL through command line

CPU_MODEL=s9keaz128aclh48 BOARD=frdm-kw41z make info-debug-variable-FEATURES_PROVIDED -C examples/hello-world --no-print-directory > pr.txt; git checkout upstream/master; CPU_MODEL=s9keaz128aclh48 BOARD=frdm-kw41z make info-debug-variable-FEATURES_PROVIDED -C examples/hello-world --no-print-directory > master.txt; diff pr.txt master.txt
#no diff

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

@fjmolinas fjmolinas merged commit e6bdcae into RIOT-OS:master Dec 2, 2019
@leandrolanzieri leandrolanzieri deleted the pr/kinetis_cpu_features branch December 3, 2019 07:30
@leandrolanzieri
Copy link
Contributor Author

Thanks for reviewing and testing

@fjmolinas fjmolinas added this to the Release 2020.01 milestone Dec 13, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Area: cpu Area: CPU/MCU ports 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) Type: cleanup The issue proposes a clean-up / The PR cleans-up parts of the codebase / documentation
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants