Skip to content

west.yml: upgrade zephyr to e40859f7 - #7316

Merged
kv2019i merged 2 commits into
thesofproject:mainfrom
kv2019i:202303-zephyr-march21
Mar 22, 2023
Merged

kv2019i merged 2 commits into
thesofproject:mainfrom
kv2019i:202303-zephyr-march21

Conversation

@kv2019i

@kv2019i kv2019i commented Mar 21, 2023 •

Copy link
Copy Markdown
Collaborator

west.yml: upgrade zephyr to e40859f7

Total of 1128 commits, including following related to
dma-dw/intel_adsp/sparse/dmic/xtensa:

e40859f78712 Revert "dma: dw: Do not program SAR/DAR and CTL_HI/LO when using HW LLI"
7a85983ebcf2 xtensa: remove ELF section address rewriting
b32b321f502a dma: dw: Poll to check for channel disable with timeout
6226f9e6e44f dma: dw: fix the return value check
08d9efb202cc dma: dw: Do not program SAR/DAR and CTL_HI/LO when using HW LLI
045c68673491 dma: dw: Add a debug utility function
bd705e68b048 soc: xtensa: esp32: increase shared memory region
9854c915ffdf intel_adsp: cpu init refactor
9d5c21d58003 dts: xtensa: nxp: remove unused include
68c1cafb411e intel_adsp: dts: ace: lower case 71C00 to fix DTC warning
a8c0123d3c54 intel_adsp: cmake: add_custom_command(.mod) to fix incremental build
b00c63e7640c footprint: ci: Remove audio SOF samples
1efaa94bc64b drivers: audio: dmic_nrfx_pdm: drop -pin support
8ef2cd20d90a Drivers: DAI: Intel: DMIC: Shorten unmute ramp time
eead89e7f22d soc: intel_adsp: cavstool.py: simplify asyncio.run() call
cdae0bb7596e boards: intel_adsp_ace15_mtpm uses xcc-clang toolchain for twister

@marc-hb

marc-hb commented Mar 21, 2023

Copy link
Copy Markdown
Collaborator

This failure just showed in daily tests, looks like this PR fixes that

https://github.com/thesofproject/sof/actions/runs/4474307457/jobs/7862637668

error: 'alias_mask' not found
error: segment DATA [0x9e0595c0:0x9e06f5c0] overlaps with BSS [0x9e06f000:0x9e072000]
rimage: /zep_workspace/sof/rimage/src/manifest.c:1339: man_write_fw_v2_5: Assertion `image->meu_offset < image->image_end' failed.

@abonislawski

Copy link
Copy Markdown
Member

update rimage

please also update git submodule

@lgirdwood

Copy link
Copy Markdown
Member

update rimage

please also update git submodule

Separate PR with rimage west update just merged.

@lgirdwood

Copy link
Copy Markdown
Member

SOFCI TEST

@marc-hb

marc-hb commented Mar 22, 2023

Copy link
Copy Markdown
Collaborator

please also update git submodule

Thanks, great catch. We have backwards-incompatible and/or rimage-related regressions right now, the last thing we want is for CI and developers to use a different rimage version depending on how they cloned.

Too late: 9aa2c13 but should be fixed in this PR.

@marc-hb
marc-hb marked this pull request as draft March 22, 2023 03:55
@marc-hb

marc-hb commented Mar 22, 2023

Copy link
Copy Markdown
Collaborator

I just extended an existing check that can now make sure git submodules and west.yml are in sync. Please review

kv2019i added 2 commits March 22, 2023 11:47
Total of 1128 commits, including following related to
dma-dw/intel_adsp/sparse/dmic/xtensa:

e40859f78712 Revert "dma: dw: Do not program SAR/DAR and CTL_HI/LO when using HW LLI"
7a85983ebcf2 xtensa: remove ELF section address rewriting
b32b321f502a dma: dw: Poll to check for channel disable with timeout
6226f9e6e44f dma: dw: fix the return value check
08d9efb202cc dma: dw: Do not program SAR/DAR and CTL_HI/LO when using HW LLI
045c68673491 dma: dw: Add a debug utility function
bd705e68b048 soc: xtensa: esp32: increase shared memory region
9854c915ffdf intel_adsp: cpu init refactor
9d5c21d58003 dts: xtensa: nxp: remove unused include
68c1cafb411e intel_adsp: dts: ace: lower case 71C00 to fix DTC warning
a8c0123d3c54 intel_adsp: cmake: add_custom_command(.mod) to fix incremental build
b00c63e7640c footprint: ci: Remove audio SOF samples
1efaa94bc64b drivers: audio: dmic_nrfx_pdm: drop -pin support
8ef2cd20d90a Drivers: DAI: Intel: DMIC: Shorten unmute ramp time
eead89e7f22d soc: intel_adsp: cavstool.py: simplify asyncio.run() call
cdae0bb7596e boards: intel_adsp_ace15_mtpm uses xcc-clang toolchain for twister

Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Update submodule to match revision used in west.yml.

Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
@kv2019i
kv2019i force-pushed the 202303-zephyr-march21 branch from 1f9be40 to bd29b78 Compare March 22, 2023 09:50
@kv2019i
kv2019i marked this pull request as ready for review March 22, 2023 09:50
@kv2019i

kv2019i commented Mar 22, 2023

Copy link
Copy Markdown
Collaborator Author

V2 update:

  • add commit to bring rimage submodule up-to-date
  • rebase on top of latest SOF main (one west.yml update merged after V1)

@kv2019i

kv2019i commented Mar 22, 2023

Copy link
Copy Markdown
Collaborator Author

One fail in https://sof-ci.01.org/sofpr/PR7316/build4963/devicetest/index.html . I can see similar error in other recent runs such as 22458 for #7302 , so will proceed with the merge.

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.

5 participants