-
Notifications
You must be signed in to change notification settings - Fork 350
zephyr: intel_adsp: Update zephyr and rename CONFIG_SOC_INTEL_ACE* to CONFIG_SOC_ACE* #10494
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
base: main
Are you sure you want to change the base?
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Pull request overview
This PR updates the Zephyr repository to commit c1a2b3be45 (490 commits) and aligns SOF configuration naming with Zephyr's current conventions by renaming CONFIG_SOC_INTEL_ACE* to CONFIG_SOC_ACE*.
Changes:
- Updated Zephyr revision to c1a2b3be459d4f34d31ae54774fd57e96438d237
- Renamed all occurrences of
CONFIG_SOC_INTEL_ACE*configuration symbols toCONFIG_SOC_ACE*(removing theINTEL_prefix) - Updated configuration checks, conditional compilation directives, and comments across multiple files
Reviewed changes
Copilot reviewed 17 out of 17 changed files in this pull request and generated no comments.
Show a summary per file
| File | Description |
|---|---|
| west.yml | Updated Zephyr revision hash |
| zephyr/lib/dma.c | Renamed CONFIG_SOC_INTEL_ACE* to CONFIG_SOC_ACE* in DMA configuration |
| zephyr/Kconfig | Updated SOC configuration symbols in heap size defaults |
| zephyr/CMakeLists.txt | Updated SOC configuration checks for platform-specific source files |
| tools/rimage/config/platform.toml | Updated SOC configuration symbols in platform includes |
| src/samples/audio/smart_amp_test.toml | Updated SOC configuration checks in module configuration |
| src/include/ipc4/alh.h | Updated SOC configuration symbol in preprocessor conditional |
| src/debug/tester/tester.toml | Updated SOC configuration checks in module configuration |
| src/audio/volume/volume.toml | Updated SOC configuration checks in module configuration |
| src/audio/up_down_mixer/up_down_mixer.toml | Updated SOC configuration checks in module configuration |
| src/audio/src/src.toml | Updated SOC configuration checks in module configuration |
| src/audio/selector/selector.toml | Updated SOC configuration checks in module configuration |
| src/audio/mixin_mixout/mixin_mixout.toml | Updated SOC configuration checks in module configuration |
| src/audio/eq_iir/eq_iir.toml | Updated SOC configuration checks in module configuration |
| src/audio/copier/copier.toml | Updated SOC configuration checks in module configuration |
| src/audio/base_fw_intel.c | Updated SOC configuration checks in preprocessor conditional |
| src/audio/asrc/asrc.toml | Updated SOC configuration checks in module configuration |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
tmleman
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks @softwarecki for taking care of updating Zephyr with the necessary changes. But to not lose the ability to do bisection in SOF, the manifest change should be in one commit together with the SOF code changes it requires. In my opinion, this can be squashed into one larger commit or split into:
- commit updating Zephyr to the latest version that doesn't require fixes on the SOF side
- commit containing the version change along with code fixes.
What you do is your choice.
|
@tmleman I guess this is the moment to choose between the blue pill and the red pill. I will go with the squash, because I need the userspace fixes that landed after the rename. |
Update zephyr to c1a2b3be45.
Rename CONFIG_SOC_INTEL_ACE* definitions to CONFIG_SOC_ACE* to match the
new naming already adopted in Zephyr.
Total of 490 commits.
Changes include:
c1a2b3be459 xtensa: Restore the EXCCAUSE register when returning from
Double Exception
fd8188a4082 xtensa: Remove saving EXCCAUSE in BSA from _Level1Vector
61e9f9ea045 soc: intel_adsp: rename CONFIG_SOC_INTEL_ACE* to
CONFIG_SOC_ACE*
1dae40fa2ef soc: rename CONFIG_INTEL_CAVS_V25 to CONFIG_SOC_CAVSV25
58f9d5e6c35 doc: releases: release-notes: 4.4: Add notes on new bits
d320921cd18 tests: subsys: llext: Add test for LLEXT_RODATA_NO_RELOC.
Signed-off-by: Adrian Warecki <adrian.warecki@intel.com>
73a80c9 to
81fe574
Compare
lgirdwood
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM, good stuff to get double exceptions reporting correctly.
Update zephyr to zephyrproject-rtos/zephyr@c1a2b3be45
Total of 490 commits.
Changes include:
zephyrproject-rtos/zephyr@c1a2b3be459 xtensa: Restore the EXCCAUSE register when returning from Double Exception
zephyrproject-rtos/zephyr@fd8188a4082 xtensa: Remove saving EXCCAUSE in BSA from _Level1Vector
zephyrproject-rtos/zephyr@61e9f9ea045 soc: intel_adsp: rename CONFIG_SOC_INTEL_ACE* to CONFIG_SOC_ACE*
zephyrproject-rtos/zephyr@1dae40fa2ef soc: rename CONFIG_INTEL_CAVS_V25 to CONFIG_SOC_CAVSV25
zephyrproject-rtos/zephyr@58f9d5e6c35 doc: releases: release-notes: 4.4: Add notes on new bits
zephyrproject-rtos/zephyr@d320921cd18 tests: subsys: llext: Add test for LLEXT_RODATA_NO_RELOC.
Update definitions to match the new naming already adopted in Zephyr. Rename
CONFIG_SOC_INTEL_ACE*toCONFIG_SOC_ACE*to use current Zephyr conventions.