From d9e6b7b977f35b9c93e1a31ab969df67d3700a91 Mon Sep 17 00:00:00 2001 From: Marc Herbert Date: Thu, 27 Jun 2024 01:28:28 +0000 Subject: [PATCH] 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 44b9d7167..4f1deed0e 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 @@ platform_configs_all = { "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 @@ platform_configs_all = { ), } -# These cannot be built out of the box yet -extra_platform_configs = { -} - platform_configs = platform_configs_all.copy() platform_configs.update(extra_platform_configs) @@ -334,6 +335,7 @@ IPC4 args = parser.parse_args() + # This does NOT include "extra", experimental platforms. if args.all: args.platforms = list(platform_configs_all)