Skip to content

CMSIS 6 update #90063

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

Merged
merged 3 commits into from
May 23, 2025
Merged

CMSIS 6 update #90063

merged 3 commits into from
May 23, 2025

Conversation

wearyzen
Copy link
Contributor

@wearyzen wearyzen commented May 16, 2025

Update release notes to announce the switch to CMSIS_6 for Cortex-M arch.
This also includes follow up changes discussed as part of PR #89370.

@github-actions github-actions bot added area: ARM ARM (32-bit) Architecture Release Notes To be mentioned in the release notes labels May 16, 2025
@wearyzen wearyzen force-pushed the cmsis_6_rel branch 2 times, most recently from bec0c84 to d704598 Compare May 16, 2025 13:03
@wearyzen
Copy link
Contributor Author

@aescolar and @fabiobaltieri this PR is a follow up of the discussion in #89370, could you please have a look and let me know your thoughts?

@wearyzen wearyzen force-pushed the cmsis_6_rel branch 2 times, most recently from e89bc7e to bbca24d Compare May 19, 2025 16:19
fabiobaltieri
fabiobaltieri previously approved these changes May 19, 2025
aescolar
aescolar previously approved these changes May 20, 2025
Copy link
Member

@aescolar aescolar left a comment

Choose a reason for hiding this comment

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

2 nits

wearyzen added 3 commits May 20, 2025 10:54
Add a note to announce the switch to CMSIS_6 for Cortex-M arch.

Signed-off-by: Sudan Landge <[email protected]>
As noted in PR zephyrproject-rtos#89370, the content of these files falls below the
trivial threshold. Therefore, it is not necessary to retain the original
copyright, which was carried over when the files were copied from the
`cmsis` module.

Signed-off-by: Sudan Landge <[email protected]>
Zephyr switched to using CMSIS_6 module in f726cb5
which breaks certain boards like `nucleo_h745zi_q/stm32h745xx/m7` when
CONFIG_CORTEX_M_DWT, CONFIG_TIMING_FUNCTIONS are enabled and cmsis from
`module/hal/cmsis` is not available (deleted explicitly after west
update).

This commit adds a provision to be able to use CMSIS_6 macros when the
module cmsis is not available.

Signed-off-by: Sudan Landge <[email protected]>
@wearyzen wearyzen dismissed stale reviews from aescolar and fabiobaltieri via dcc031d May 20, 2025 09:54
Copy link

Copy link
Contributor

@dkalowsk dkalowsk left a comment

Choose a reason for hiding this comment

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

Minor comments/question, with the rest looking good to me


* Cortex-M boards/socs now require the ``CMSIS_6`` module to build properly (instead of ``cmsis``
which was CMSIS 5.9.0).
If trying to build a Cortex-M board, do a ``west update`` to make sure that ``CMSIS_6`` module is
Copy link
Contributor

Choose a reason for hiding this comment

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

minor suggestion, not a blocker to merge though
Before building a Cortex-M board, run west update to ensure that the CMSIS_6 module is...

If trying to build a Cortex-M board, do a ``west update`` to make sure that ``CMSIS_6`` module is
available before running ``west build`` or other commands.

Boards or SOCs or modules using the older ``cmsis`` module either with a local copy or via the
Copy link
Contributor

Choose a reason for hiding this comment

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

Boards, SOCs, or modules using the older...


Boards or SOCs or modules using the older ``cmsis`` module either with a local copy or via the
:kconfig:option:`CONFIG_ZEPHYR_CMSIS_MODULE_DIR` are requested to move to the ``CMSIS_6`` module
which can be accessed via the :kconfig:option:`CONFIG_ZEPHYR_CMSIS_6_MODULE_DIR` configuration.
Copy link
Contributor

Choose a reason for hiding this comment

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

should there be a line adding when the deprecation of CMSIS 5 for Cortex-M projects is expected?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I am not sure when this would happen since we request the HAL owners to move to CMSIS_6 but its really up to them when to actually do this.

@nashif nashif assigned wearyzen and unassigned dkalowsk and danieldegrasse May 23, 2025
@nashif nashif merged commit 2ddec2f into zephyrproject-rtos:main May 23, 2025
33 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area: ARM ARM (32-bit) Architecture Release Notes To be mentioned in the release notes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants