Skip to content

Conversation

@tomi-font
Copy link
Collaborator

@tomi-font tomi-font commented Jul 19, 2024

This adds all the files (minus .git* and CMSIS/Documentation/ for saving on size) from the CMSIS v6 repository
(https://github.com/ARM-software/CMSIS_6) at the revision d0c460c169 as defined in lib/ext/cmsis/CMakeLists.txt.
The patch lib/ext/cmsis/0001-iar-Add-missing-v8.1m-check is applied on top.

This is because as of v2.1.0 TF-M has updated to CMSIS v6 and switched from hosting the sources to depending on the upstream repository, cloning it at build time.

To prevent a download from happening during the build, CMSIS v6 sources are pushed and the CMSIS_PATH CMake variable is used to point to them.

This adds all the files (minus `.git*` and `CMSIS/Documentation/`
for saving on size) from the CMSIS v6 repository
(https://github.com/ARM-software/CMSIS_6) at the revision `d0c460c169`
as defined in `lib/ext/cmsis/CMakeLists.txt`.
The patch `lib/ext/cmsis/0001-iar-Add-missing-v8.1m-check` is applied
on top.

This is because as of v2.1.0 TF-M has updated to CMSIS v6 and switched
from hosting the sources to depending on the upstream repository,
cloning it at build time.

To prevent a download from happening during the build, CMSIS v6 sources
are pushed and the CMSIS_PATH CMake variable is used to point to them.

Signed-off-by: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no>
@tomi-font tomi-font force-pushed the fix_cmsis_clone_in_build branch from e1bca77 to 9695866 Compare July 19, 2024 10:34
Copy link
Collaborator

@ithinuel ithinuel left a comment

Choose a reason for hiding this comment

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

It doesn't seem to be an appropriate answer for the mid/long term but considering it's criticality for the release I'm giving it a ✅

@tomi-font
Copy link
Collaborator Author

It doesn't seem to be an appropriate answer for the mid/long term but considering it's criticality for the release I'm giving it a ✅

Yeah, it can then be reverted and the proper solution implemented.

@fabiobaltieri fabiobaltieri requested review from aescolar and nashif July 19, 2024 14:03
@aescolar aescolar requested a review from d3zd3z July 22, 2024 08:37
Copy link
Collaborator

@d3zd3z d3zd3z left a comment

Choose a reason for hiding this comment

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

Two concerns here:

  • Why are we pulling this into trusted-firmware-m instead of creating a module for cmsis 6? We're already pulling in cmsis_5.
  • We need approval from the TSC in order to pull in additional external code.

@tomi-font
Copy link
Collaborator Author

Why are we pulling this into trusted-firmware-m instead of creating a module for cmsis 6? We're already pulling in cmsis_5.

Because this is a quick fix that was suggested to get it in 3.7. Indeed creating a module is the proper way and shall be done. I don't know if people will accept creating a new module directly and integrating it into 3.7, which is why this quick fix.

Copy link
Collaborator

@d3zd3z d3zd3z left a comment

Choose a reason for hiding this comment

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

No objections from the TSC

@aescolar aescolar merged commit 069455b into zephyrproject-rtos:main Jul 24, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants