From 85faeafb67e872dd47fe00489e04bdb6acb32bf2 Mon Sep 17 00:00:00 2001 From: Guennadi Liakhovetski Date: Thu, 19 Dec 2024 07:55:47 +0100 Subject: [PATCH 1/4] Zephyr: upgrade to include a build fix Upgrade to a Zephyr version, containing 6f1fc6e96c60 ("drivers: dai: ssp: remove unused variables") to fix build failures. Signed-off-by: Guennadi Liakhovetski --- west.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/west.yml b/west.yml index 93c803c8d725..7cc885990454 100644 --- a/west.yml +++ b/west.yml @@ -43,7 +43,7 @@ manifest: - name: zephyr repo-path: zephyr - revision: 36517253160663f5cdb0f496cb166236fe4ad4c4 + revision: 54435e000afa08fa05ce4417abd615e2fe6788d4 remote: zephyrproject # Import some projects listed in zephyr/west.yml@revision From cd3700cddbf9f837b8a08917ca7eac004586c30c Mon Sep 17 00:00:00 2001 From: Guennadi Liakhovetski Date: Wed, 18 Dec 2024 09:10:54 +0100 Subject: [PATCH 2/4] ci: upgrade to Zephyr SDK 0.17.0 0.16.4 doesn't support PTL, upgrade to the current 0.17.0. Signed-off-by: Guennadi Liakhovetski --- .github/workflows/zephyr.yml | 12 ++++++------ zephyr/docker-run.sh | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/zephyr.yml b/.github/workflows/zephyr.yml index e522df6a84f4..e077ed1944dd 100644 --- a/.github/workflows/zephyr.yml +++ b/.github/workflows/zephyr.yml @@ -260,12 +260,12 @@ jobs: # Keep this SDK version identical to the one in # sof/zephyr/docker-run.sh - - name: Cache Zephyr SDK 0.16.4 + - name: Cache Zephyr SDK 0.17.0 id: cache-zephyr-sdk uses: actions/cache@v4 with: - path: zephyr-sdk-0.16.4_windows-x86_64.7z - key: ${{ runner.os }}-cache-zephyr-sdk-0-16-4 + path: zephyr-sdk-0.17.0_windows-x86_64.7z + key: ${{ runner.os }}-cache-zephyr-sdk-0-17-0 # Wget is needed by Zephyr SDK setup.cmd installation script - name: Download wget @@ -273,11 +273,11 @@ jobs: run: | curl -L -O http://downloads.sourceforge.net/gnuwin32/wget-1.11.4-1-bin.zip - - name: Download Zephyr SDK 0.16.4 + - name: Download Zephyr SDK 0.17.0 if: ${{ steps.cache-zephyr-sdk.outputs.cache-hit != 'true' }} run: | # yamllint disable-line rule:line-length curl -L -O ` - https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.16.4/zephyr-sdk-0.16.4_windows-x86_64.7z + https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.17.0/zephyr-sdk-0.17.0_windows-x86_64.7z # Unzips every .zip package to directory matching its name without extension - name: Unzip downloaded packages @@ -300,7 +300,7 @@ jobs: # setup.cmd may not be called in from msys shell as it does not parse # forward slash script input arguments correctly. - name: Install Zephyr SDK - run: zephyr-sdk-0.16.4_windows-x86_64/zephyr-sdk-0.16.4/setup.cmd /t all /h /c + run: zephyr-sdk-0.17.0_windows-x86_64/zephyr-sdk-0.17.0/setup.cmd /t all /h /c - name: Setup Python uses: actions/setup-python@v5 diff --git a/zephyr/docker-run.sh b/zephyr/docker-run.sh index 5fa229e2ce30..fccee059be81 100755 --- a/zephyr/docker-run.sh +++ b/zephyr/docker-run.sh @@ -54,7 +54,7 @@ main() run_command() { - # zephyr-build:v0.26.6 has /opt/toolchains/zephyr-sdk-0.16.4 + # zephyr-build:v0.27.4 has /opt/toolchains/zephyr-sdk-0.17.0 # https://hub.docker.com/r/zephyrprojectrtos/zephyr-build/tags # # Keep this SDK version identical to the one in @@ -63,7 +63,7 @@ run_command() --workdir /zep_workspace \ $SOF_DOCKER_RUN \ --env REAL_CC --env http_proxy --env https_proxy \ - ghcr.io/zephyrproject-rtos/zephyr-build:v0.26.6 \ + ghcr.io/zephyrproject-rtos/zephyr-build:v0.27.4 \ ./sof/scripts/sudo-cwd.sh "$@" } From 59477bd57ad5c6fb1cf4288a07b3803cd0ca9f55 Mon Sep 17 00:00:00 2001 From: Guennadi Liakhovetski Date: Wed, 18 Dec 2024 08:32:11 +0100 Subject: [PATCH 3/4] ci: add a PTL build test Now that the Zephyr SDK has support for PTL we can add a build test. Signed-off-by: Guennadi Liakhovetski --- .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 e077ed1944dd..51c0576f5743 100644 --- a/.github/workflows/zephyr.yml +++ b/.github/workflows/zephyr.yml @@ -110,7 +110,7 @@ jobs: # - IPC3 default imx8 imx8x imx8m imx8ulp, # - IPC4 default - mtl, lnl, + mtl, lnl, ptl, # Temporary testbed for Zephyr development. tgl tgl-h, ] From f2818d9f8a75ca47c411c6e90f42107f9b76a7a1 Mon Sep 17 00:00:00 2001 From: Guennadi Liakhovetski Date: Wed, 18 Dec 2024 08:34:29 +0100 Subject: [PATCH 4/4] build: ptl: an open-source toolchain is available for PTL Zephyr SDK now supports PTL beginning with 0.16.9, update the build script. Signed-off-by: Guennadi Liakhovetski --- scripts/xtensa-build-zephyr.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/xtensa-build-zephyr.py b/scripts/xtensa-build-zephyr.py index 465c87d6e896..5ce0c633ae7c 100755 --- a/scripts/xtensa-build-zephyr.py +++ b/scripts/xtensa-build-zephyr.py @@ -91,12 +91,6 @@ class PlatformConfig: # These cannot be built by everyone out of the box yet. # For instance: there's no open-source toolchain available for them yet. extra_platform_configs = { - "ptl" : PlatformConfig( - "intel", "intel_adsp/ace30/ptl", - f"RI-2022.10{xtensa_tools_version_postfix}", - "ace30_LX7HiFi4_PIF", - ipc4 = True - ), "ptl-sim" : PlatformConfig( "intel", "intel_adsp/ace30/ptl/sim", f"RI-2022.10{xtensa_tools_version_postfix}", @@ -145,6 +139,12 @@ class PlatformConfig: "ace10_LX7HiFi4_2022_10", ipc4 = True ), + "ptl" : PlatformConfig( + "intel", "intel_adsp/ace30/ptl", + f"RI-2022.10{xtensa_tools_version_postfix}", + "ace30_LX7HiFi4_PIF", + ipc4 = True + ), # NXP platforms "imx8" : PlatformConfig(