Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[SKIP SOF-TEST] xtensa-build-zephyr.py: move PTL out of "all" and into "extra". #9266

Merged
merged 2 commits into from
Jul 2, 2024
Merged

[SKIP SOF-TEST] xtensa-build-zephyr.py: move PTL out of "all" and into "extra". #9266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8181e2b
xtensa-build-zephyr.py: move PTL out of "all" and into "extra".
marc-hb Jun 27, 2024
0b84ae1
.github: add a test for xtensa-build-zephyr.py --all
marc-hb Jun 27, 2024
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
5 changes: 5 additions & 0 deletions .github/workflows/zephyr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,11 @@ jobs:
zephyr_revision: mnfst
IPC_platforms: mtl

# This is "duplication of effort" but it makes sure no one
# breaks --all, see for instance #9262 and previous commit.
- zephyr_revision: mnfst
IPC_platforms: --all

steps:
- uses: actions/checkout@v4
# Download a full clone to fix `git describe`, sof_version.h and
Expand Down
34 changes: 18 additions & 16 deletions scripts/xtensa-build-zephyr.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,23 @@ class PlatformConfig:
aliases: list = dataclasses.field(default_factory=list)
ipc4: bool = False

# These cannot be built by everyone out of the box yet.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Eventually toolchain will be availalbe later? Then FIXME or TODO placeholder may be nicer?
Otherwise looks good.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Eventually toolchain will be availalbe later?

Yes hopefully. As @andyross said: this is a Zephyr SDK issue.

# 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}",
"ace30_LX7HiFi4_PIF",
ipc4 = True
),
}

# These can all be built out of the box. --all builds all these.
# Some of these values are duplicated in sof/scripts/set_xtensa_param.sh: keep them in sync.
platform_configs_all = {
Expand Down Expand Up @@ -120,18 +137,6 @@ 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
),
"ptl-sim" : PlatformConfig(
"intel", "intel_adsp/ace30_ptl_sim",
f"RI-2022.10{xtensa_tools_version_postfix}",
"ace30_LX7HiFi4_PIF",
ipc4 = True
),

# NXP platforms
"imx8" : PlatformConfig(
Expand Down Expand Up @@ -160,10 +165,6 @@ class PlatformConfig:
),
}

# These cannot be built out of the box yet
extra_platform_configs = {
}

platform_configs = platform_configs_all.copy()
platform_configs.update(extra_platform_configs)

Expand Down Expand Up @@ -327,6 +328,7 @@ def parse_args():

args = parser.parse_args()

# This does NOT include "extra", experimental platforms.
if args.all:
args.platforms = list(platform_configs_all)

Expand Down
Loading