Skip to content

Conversation

@dbaluta
Copy link
Collaborator

@dbaluta dbaluta commented May 19, 2025

After commit
f726cb5123eda12fe ("modules: CMSIS_6: Switch to CMSIS_6 for Cortex-M") SOF needs cmsis_6 to be used for Cortex-M (imx95).

So import cmsis_6 and fix the compilation error.

Fixes: #10014

Copilot AI review requested due to automatic review settings May 19, 2025 07:29
Copy link

Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull Request Overview

A concise update to the manifest file to import the cmsis_6 dependency required for Cortex-M targets, specifically addressing the compilation error for SOF on IMX95.

  • Imported cmsis_6 into the manifest
  • Fixed compilation issues related to missing dependency

- lz4
- tinycrypt
- cmsis
- cmsis_6
Copy link

Copilot AI May 19, 2025

Choose a reason for hiding this comment

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

Ensure that including both 'cmsis' and 'cmsis_6' is intentional; if they serve different purposes, consider adding a clarifying comment to explain their roles.

Copilot uses AI. Check for mistakes.
Copy link
Contributor

Choose a reason for hiding this comment

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

Based on this commit zephyrproject-rtos/zephyr@f726cb5123eda12fe I would say that cmsis_6 is enough for SOF since we only support Cortex M (no Cortex A/R which uses cmsis).
So, please change cmsis with cmsis_6.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Good point. thanks @iuliana-prodan

@dbaluta dbaluta force-pushed the fix_m_build branch 2 times, most recently from 1ef4c94 to 0c737b6 Compare May 19, 2025 08:48
After commit
f726cb5123eda ("modules: CMSIS_6: Switch to CMSIS_6 for Cortex-M")
SOF needs cmsis_6 to be used for Cortex-M (imx95).

So import cmsis_6 and fix the compilation error.

Since we only support Cortex-M targets (no Cortex A/R) let's get rid of
cmsis import to reduce import time.

Fixes: thesofproject#10014
Signed-off-by: Daniel Baluta <daniel.baluta@nxp.com>
@kv2019i kv2019i requested a review from iuliana-prodan May 19, 2025 11:10
@dbaluta dbaluta merged commit e9ea28a into thesofproject:main May 19, 2025
42 of 48 checks passed
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.

[BUG] IMX95 build fails with May15 Zephyr main

3 participants