Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions .github/workflows/zephyr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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,
]
Expand Down Expand Up @@ -260,24 +260,24 @@ 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
if: ${{ steps.cache-wget.outputs.cache-hit != 'true' }}
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
Expand All @@ -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
Expand Down
12 changes: 6 additions & 6 deletions scripts/xtensa-build-zephyr.py
Original file line number Diff line number Diff line change
Expand Up @@ -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}",
Expand Down Expand Up @@ -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(
Expand Down
2 changes: 1 addition & 1 deletion west.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions zephyr/docker-run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 "$@"
}

Expand Down
Loading