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.

Sign up for GitHub

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

Jump to bottom

manifest: upmerge to SOF fcd3f18b3 #62262

Merged
merged 1 commit into from
Sep 6, 2023
Merged

manifest: upmerge to SOF fcd3f18b3 #62262

merged 1 commit into from
Sep 6, 2023

Conversation

nashif
Copy link
Member

@nashif nashif commented Sep 4, 2023 •
edited
Loading

Upmerge to SOF fcd3f18b307125fc7a671638d4612ff9ddbe7cb3.

Signed-off-by: Anas Nashif [email protected]

@zephyrbot
Copy link
Collaborator

zephyrbot commented Sep 4, 2023 •
edited
Loading

The following west manifest projects have been modified in this Pull Request:

Name Old Revision New Revision Diff
sof zephyrproject-rtos/sof@ee40f61 zephyrproject-rtos/sof@e32b825 (zephyr) zephyrproject-rtos/[email protected]

Note: This message is automatically posted and updated by the Manifest GitHub Action.

fabiobaltieri
fabiobaltieri previously approved these changes Sep 4, 2023
View reviewed changes
@fabiobaltieri fabiobaltieri mentioned this pull request Sep 4, 2023
Merged
@nashif nashif requested a review from kv2019i September 4, 2023 19:38
@nashif nashif changed the title manifest: upmerge to SOF 846b5185f manifest: upmerge to SOF fcd3f18b3 Sep 4, 2023
@nashif nashif force-pushed the sof_up_0409 branch 2 times, most recently from aab94f9 to 1591658 Compare September 4, 2023 23:37
fabiobaltieri
fabiobaltieri previously approved these changes Sep 5, 2023
View reviewed changes
@fabiobaltieri
Copy link
Member

Hey, this is now failing intel_adsp_cavs25 sample.audio.sof, looks like thesofproject/sof@9948d43 enabled something that needs a submodule by default. Not sure how to fix this properly, the submodule definition does not even have a full path so it's not like we can add that module as is even if we wanted to.

@zephyrbot zephyrbot added manifest-tomlc99 manifest-rimage DNM This PR should not be merged (Do Not Merge) labels Sep 5, 2023
@nashif
Copy link
Member Author

nashif commented Sep 5, 2023

new entries in manifest already approved: #58212

fabiobaltieri
fabiobaltieri reviewed Sep 5, 2023
View reviewed changes
west.yml Outdated
Comment on lines 319 to 324
- name: rimage
repo-path: rimage
path: modules/audio/sof/rimage
revision: 4fb9fe00575bc2e9f14570803d811987fb27f010
- name: tomlc99
repo-path: tomlc99
path: moduled/audio/sof/rimage/tomlc99
revision: e3a03f5ec7d8d33be705c5ce8a632d998ce9b4d1
Copy link
Member

Choose a reason for hiding this comment

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

can you add a MAINTAINERS.yml entry for these two?

@nashif nashif requested a review from MaureenHelm as a code owner September 5, 2023 11:17
fabiobaltieri
fabiobaltieri previously approved these changes Sep 5, 2023
View reviewed changes
@nashif
Copy link
Member Author

nashif commented Sep 5, 2023

looks like new entries in west need to be part of the cache!

gmarull
gmarull reviewed Sep 6, 2023
View reviewed changes
west.yml Outdated
Comment on lines 316 to 318
- name: sof
revision: ee40f61b5725b6615f1abea4a78cc4d90ce144b8
revision: fcd3f18b307125fc7a671638d4612ff9ddbe7cb3
path: modules/audio/sof
Copy link
Member

@gmarull gmarull Sep 6, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

why isn't this using submodule: true

Copy link
Member Author

Choose a reason for hiding this comment

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

sof project itself does not use that and rely on west, the submodules are there for backward compatibility only. Looking for a solution still.

@zephyrbot zephyrbot removed the DNM This PR should not be merged (Do Not Merge) label Sep 6, 2023
@nashif
Copy link
Member Author

nashif commented Sep 6, 2023

@fabiobaltieri I reverted back to old commit + your patch and will address the manifest/module issue later.

@nashif
manifest: Update SOF tree with zephyr related fixes
367eb33 
- Updates with a patch fixing CONTAINER_OF issues by Fabio.
- init.h include fixes by Gerlad

Signed-off-by: Anas Nashif <[email protected]>
@nashif
Copy link
Member Author

nashif commented Sep 6, 2023

@gmarull this now includes your init.h commits as well.

@gmarull
Copy link
Member

gmarull commented Sep 6, 2023

@gmarull this now includes your init.h commits as well.

thanks

@gmarull gmarull mentioned this pull request Sep 6, 2023
Closed
@nashif nashif merged commit af03d37 into zephyrproject-rtos:main Sep 6, 2023
19 checks passed
@nashif nashif deleted the sof_up_0409 branch September 6, 2023 13:07
@kv2019i kv2019i mentioned this pull request Sep 7, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gmarull gmarull gmarull approved these changes

@fabiobaltieri fabiobaltieri fabiobaltieri approved these changes

@kv2019i kv2019i Awaiting requested review from kv2019i

@MaureenHelm MaureenHelm Awaiting requested review from MaureenHelm

@stephanosio stephanosio Awaiting requested review from stephanosio

Assignees
No one assigned
Labels
area: Process manifest manifest-rimage manifest-sof manifest-tomlc99
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@nashif @zephyrbot @fabiobaltieri @gmarull @MaureenHelm