From 8181e2bb4530a5706220fdee09c0893b75d243bd Mon Sep 17 00:00:00 2001 From: Marc Herbert Date: Thu, 27 Jun 2024 01:28:28 +0000 Subject: [PATCH 1/2] xtensa-build-zephyr.py: move PTL out of "all" and into "extra". As reported in #9262, this fixes the --all option. Fixes commit 05bfc36dacbd ("ptl: Add initial PTL configuration") Signed-off-by: Marc Herbert --- scripts/xtensa-build-zephyr.py | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/scripts/xtensa-build-zephyr.py b/scripts/xtensa-build-zephyr.py index 648393ed70ff..a88e31f15455 100755 --- a/scripts/xtensa-build-zephyr.py +++ b/scripts/xtensa-build-zephyr.py @@ -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. +# 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 = { @@ -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( @@ -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) @@ -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) From 0b84ae1a7a9f7b769fc420794f41cc3f0a9ee9ba Mon Sep 17 00:00:00 2001 From: Marc Herbert Date: Thu, 27 Jun 2024 01:35:58 +0000 Subject: [PATCH 2/2] .github: add a test for xtensa-build-zephyr.py --all Add a test to avoid --all breakages like the one in commit 05bfc36dacbd ("ptl: Add initial PTL configuration"), reported in #9262 See also previous commit. Signed-off-by: Marc Herbert --- .github/workflows/zephyr.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/zephyr.yml b/.github/workflows/zephyr.yml index 73c20fcb5b67..6112e7d4ac59 100644 --- a/.github/workflows/zephyr.yml +++ b/.github/workflows/zephyr.yml @@ -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