Skip to content

stable-v2.0: un-hardcode Zephyr container and SDK - #5740

Merged
lgirdwood merged 2 commits into
thesofproject:stable-v2.0from
marc-hb:unhardcode-zcontainer2.0
Apr 27, 2022
Merged

lgirdwood merged 2 commits into
thesofproject:stable-v2.0from
marc-hb:unhardcode-zcontainer2.0

Conversation

@marc-hb

@marc-hb marc-hb commented Apr 27, 2022

Copy link
Copy Markdown
Collaborator

2 commits, see commit messages.

marc-hb added 2 commits April 27, 2022 01:04
The brand new sof/stable-v2.0 branch has (for now) only these two
commits that restore compatibility with the 0.14.0 Zephyr SDK and the
latest zephyr-build container

51d2a25590cc "Revert cmake: Zephyr sdk backward compatibility with 0.11.1 and 0.11.2"
af345ec33aa2 (sof/sof/stable-v2.0) cmake: remove xtensa workaround in Zephyr toolchain code.

See longer story in review thesofproject#5654 for commit 7ec25f1

Signed-off-by: Marc Herbert <marc.herbert@intel.com>
This reverts commit 7ec25f1 because
compatibility with the latest SDK has just been restored in brand new
branch https://github.com/thesofproject/zephyr/commits/sof/stable-v2.0

Signed-off-by: Marc Herbert <marc.herbert@intel.com>
@marc-hb

marc-hb commented Apr 27, 2022

Copy link
Copy Markdown
Collaborator Author

https://github.com/thesofproject/sof/runs/6186046276 shows a successful builds with Zephyr container Digest: sha256:705718103b5ddaced91c02243c7a90bf74a286742497561b727509e78aa0ab77 Downloaded newer image for zephyrprojectrtos/zephyr-build:latest, the latest Zephyr SDK 0.14.1 and the Zephyr version from new branch: https://github.com/thesofproject/zephyr/commits/sof/stable-v2.0

* af345ec3 (HEAD) cmake: remove xtensa workaround in Zephyr toolchain code.
* 51d2a255 Revert "cmake: Zephyr sdk backward compatibility with 0.11.1 and 0.11.2"
* fd089b36 uart: sifive: align txcnt of UART1 with UART0
* abeaf948 soc: arc: fix ARC_HAS_ACCL_REGS settings
....
-- Zephyr version: 2.7.99 (/workdir/zephyrproject/zephyr), build: af345ec33aa2

@marc-hb
marc-hb requested a review from keqiaozhang April 27, 2022 01:21
@marc-hb

marc-hb commented Apr 27, 2022

Copy link
Copy Markdown
Collaborator Author

As expected, https://sof-ci.01.org/sofpr/PR5740/build142/build/ fails to build Zephyr because it's trying to mix and match SOF stable with the latest Zephyr main branch. It's a known issue.

[2/260] Generating include/generated/version.h
-- Zephyr version: 3.0.99 (/srv/home/jenkins/workspace/sof_generic_build@3/zephyrproject/zephyr), build: c3c026e03cac

@lgirdwood
lgirdwood merged commit 844ed48 into thesofproject:stable-v2.0 Apr 27, 2022
@marc-hb
marc-hb deleted the unhardcode-zcontainer2.0 branch May 12, 2022 16:58
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.

2 participants