From f3a0f593608e85730b30b27d04c30ea063d7d7bc Mon Sep 17 00:00:00 2001 From: Marc Herbert Date: Wed, 27 Apr 2022 00:58:31 +0000 Subject: [PATCH 1/2] xtensa-build-zephyr.sh: switch to new Zephyr branch sof/stable-v2.0 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 #5654 for commit 7ec25f16af9e Signed-off-by: Marc Herbert --- scripts/xtensa-build-zephyr.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/xtensa-build-zephyr.sh b/scripts/xtensa-build-zephyr.sh index d109f274b470..a6f3b5a74fd0 100755 --- a/scripts/xtensa-build-zephyr.sh +++ b/scripts/xtensa-build-zephyr.sh @@ -118,11 +118,11 @@ west_init_update() { # Default Zephyr remote and branch if nothing passed on the # command line. - local init_remote="${1:-https://github.com/zephyrproject-rtos/zephyr}" + local init_remote="${1:-https://github.com/thesofproject/zephyr}" # This can be a branch, a 40-digit SHA or empty to fetch the # default branch - local init_ref="${2:-fd089b361d8aebbcb49cca989444aaeb0b6fbb4d}" + local init_ref="${2:-sof/stable-v2.0}" # git fetch accepts anything, even 40-digits SHA but git clone is # less flexible. So we git clone the default branch first to get From fbc0efb91d0157cd6927889b68511fe76501e449 Mon Sep 17 00:00:00 2001 From: Marc Herbert Date: Wed, 27 Apr 2022 01:05:59 +0000 Subject: [PATCH 2/2] Revert ".github/zephyr: hardcode zephyr container version to v0.21.0" This reverts commit 7ec25f16af9ea557aaf0a4bbef6ab7ffc5505a0b 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 --- .github/workflows/zephyr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/zephyr.yml b/.github/workflows/zephyr.yml index d46415d415d8..ab81c6ba8008 100644 --- a/.github/workflows/zephyr.yml +++ b/.github/workflows/zephyr.yml @@ -19,5 +19,5 @@ jobs: # -e https_proxy=... - name: build run: docker run -v "$(pwd)":/workdir - docker.io/zephyrprojectrtos/zephyr-build:v0.21.0 + docker.io/zephyrprojectrtos/zephyr-build:latest ./zephyr/docker-build.sh -- -DEXTRA_CFLAGS='-Werror'