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

Update CMSIS-Core to v5.9.0 #333

Merged
merged 3 commits into from
Jan 18, 2023
Merged

Update CMSIS-Core to v5.9.0 #333

merged 3 commits into from
Jan 18, 2023

Conversation

Jake-Carter
Copy link
Contributor

@Jake-Carter Jake-Carter commented Jan 16, 2023

This PR updates our CMSIS-Core support to the latest release v5.9.0 branch.

Our existing CMSIS-Core files from v3.2.0 are conflicting with the CMSIS-DSP library files, since the organization of the files has changed significantly with v5+. As a result, attempting to #include "arm_math.h" and #include "mxc_device.h" in the same file results in conflicting compiler definitions for the Arm M4 core intrinsic functions and other macros.

Summary of changes:

  • Copy all files from the v5.9.0 CMSIS-Core Include folder into Libraries/CMSIS/5.9.0/Core/Include
    • Note: We could arguably exclude some of the files for cores we don't support, but copying everything has a lower risk of missing an inclusion on some edge-case.
  • Copy our RV32 file to the same directory (see a8b61c6)
  • Update Makefiles to search Libraries/CMSIS/5.9.0/Core/Include instead of Libraries/CMSIS/Include (see f87995c)

@Jake-Carter Jake-Carter added the help wanted Extra attention is needed label Jan 18, 2023
@Jake-Carter
Copy link
Contributor Author

Help wanted with functional testing across all micros!

Copy link
Contributor

@sihyung-maxim sihyung-maxim left a comment

Choose a reason for hiding this comment

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

Tested three different parts with each running different examples. Everything looks good.

@Jake-Carter Jake-Carter merged commit a068414 into main Jan 18, 2023
@Jake-Carter Jake-Carter deleted the dev/cmsis-core branch January 18, 2023 19:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
help wanted Extra attention is needed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants