From cf6e6b03e0574ab8b59f7df3bb23c0f55ce5db97 Mon Sep 17 00:00:00 2001 From: Serhiy Katsyuba Date: Wed, 27 Aug 2025 10:38:36 +0200 Subject: [PATCH 1/3] nvl: Fix CI failure Toolchain for ACE4 is not yet available in Zephyr. Move (temporarily) nvl and nvl-s platforms to extra_platform_configs to avoid CI build with missing Zephyr toolchain. Signed-off-by: Serhiy Katsyuba --- scripts/xtensa-build-zephyr.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/scripts/xtensa-build-zephyr.py b/scripts/xtensa-build-zephyr.py index bfb63d53de5e..ae9e4267d64e 100755 --- a/scripts/xtensa-build-zephyr.py +++ b/scripts/xtensa-build-zephyr.py @@ -92,6 +92,18 @@ 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 = { + "nvl" : PlatformConfig( + "intel", "intel_adsp/ace40/nvl", + f"RI-2022.10{xtensa_tools_version_postfix}", + "ace4px_HiFi5MMU_PIF_nlib", + ipc4 = True + ), + "nvl-s" : PlatformConfig( + "intel", "intel_adsp/ace40/nvls", + f"RI-2022.10{xtensa_tools_version_postfix}", + "ace4px_HiFi5MMU_PIF_nlib", + ipc4 = True + ), "wcl-sim" : PlatformConfig( "intel", "intel_adsp/ace30/wcl/sim", f"RI-2022.10{xtensa_tools_version_postfix}", @@ -180,18 +192,6 @@ class PlatformConfig: "ace30_LX7HiFi4_PIF", ipc4 = True ), - "nvl" : PlatformConfig( - "intel", "intel_adsp/ace40/nvl", - f"RI-2022.10{xtensa_tools_version_postfix}", - "ace4px_HiFi5MMU_PIF_nlib", - ipc4 = True - ), - "nvl-s" : PlatformConfig( - "intel", "intel_adsp/ace40/nvls", - f"RI-2022.10{xtensa_tools_version_postfix}", - "ace4px_HiFi5MMU_PIF_nlib", - ipc4 = True - ), # NXP platforms "imx8" : PlatformConfig( From 58f73f3e8f32b80eb72a904a8f7b96fe28c1270c Mon Sep 17 00:00:00 2001 From: Serhiy Katsyuba Date: Wed, 27 Aug 2025 16:53:05 +0200 Subject: [PATCH 2/3] debug: Fix missing tester.toml include tester.toml should be included by the platform's *.toml.h file in order for the tester module to be functional as a builtin module. Before this fix, the tester module only worked on MTL as a builtin and as an LLEXT module on LNL, PTL, WCL. And not functional at all on NVL. Signed-off-by: Serhiy Katsyuba --- tools/rimage/config/lnl.toml.h | 4 ++++ tools/rimage/config/nvl.toml.h | 4 ++++ tools/rimage/config/ptl.toml.h | 4 ++++ tools/rimage/config/wcl.toml.h | 4 ++++ 4 files changed, 16 insertions(+) diff --git a/tools/rimage/config/lnl.toml.h b/tools/rimage/config/lnl.toml.h index 6d1e0f0ef04a..f369df356274 100644 --- a/tools/rimage/config/lnl.toml.h +++ b/tools/rimage/config/lnl.toml.h @@ -38,6 +38,10 @@ index = __COUNTER__ +#if defined(CONFIG_COMP_TESTER) || defined(LLEXT_FORCE_ALL_MODULAR) +#include +#endif + #if defined(CONFIG_COMP_MIXIN_MIXOUT) || defined(LLEXT_FORCE_ALL_MODULAR) #include