From 013e21020959c45710942c77fc38031b9a810858 Mon Sep 17 00:00:00 2001 From: Kai Vehmanen Date: Fri, 31 May 2024 11:19:18 +0300 Subject: [PATCH] west.ytml: update to Zephyr 53ddff639562 Update Zephyr baseline to 53ddff639562 . The location of generated headers has changed, so modify the SOF build scripts to use the new location. Change affecting SOF build targets: 6509b8199b02 shell: add shell backend for audio DSP using shared memory window 5a7600bec60b soc: intel_adsp: tools: add shell support to cavstool.py db00b813f043 soc: intel_adsp: tools: align code style in maps_regs() 44dd5a4da9c0 soc: intel_adsp: tools: fix ace20 fw load flow fa798ce2d5be soc: intel_adsp: only implement FW_STATUS boot protocol for cavs 8fc76f1b6d16 soc: intel_adsp: tools: improve FW boot handling on ace1.x 024bd41efb65 llext: xtensa: add support for the xt-clang toolchain Signed-off-by: Kai Vehmanen --- scripts/xtensa-build-zephyr.py | 4 ++-- west.yml | 2 +- zephyr/CMakeLists.txt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/xtensa-build-zephyr.py b/scripts/xtensa-build-zephyr.py index 4e29c359b..25a469260 100755 --- a/scripts/xtensa-build-zephyr.py +++ b/scripts/xtensa-build-zephyr.py @@ -1029,8 +1029,8 @@ def install_platform(platform, sof_output_dir, platf_build_environ, platform_wco installed_files = [ # Fail if one of these is missing InstFile(".config", "config", txt=True), - InstFile("include/generated/autoconf.h", "generated_autoconf.h", txt=True), - InstFile("include/generated/version.h", "zephyr_version.h", + InstFile("include/generated/zephyr/autoconf.h", "generated_autoconf.h", txt=True), + InstFile("include/generated/zephyr/version.h", "zephyr_version.h", gzip=False, txt=True), InstFile("include/generated/sof_versions.h", "sof_versions.h", gzip=False, txt=True), diff --git a/west.yml b/west.yml index 2d2ae0640..9a9f87702 100644 --- a/west.yml +++ b/west.yml @@ -43,7 +43,7 @@ manifest: - name: zephyr repo-path: zephyr - revision: 69d790b293316ae3651f244f2452705ee65c1f4b + revision: 53ddff639562ef68dc0a6f62b82f7505c75ebdce remote: zephyrproject # Import some projects listed in zephyr/west.yml@revision diff --git a/zephyr/CMakeLists.txt b/zephyr/CMakeLists.txt index d230de902..3958e767a 100644 --- a/zephyr/CMakeLists.txt +++ b/zephyr/CMakeLists.txt @@ -76,7 +76,7 @@ function(sof_llext_build module) PRE_BUILD COMMAND ${CMAKE_C_COMPILER} -E ${CMAKE_CURRENT_LIST_DIR}/llext.toml.h -P -DREM= -I${SOF_BASE} -I${SOF_BASE}src - -imacros ../include/generated/autoconf.h + -imacros ../include/generated/zephyr/autoconf.h -o rimage_config.toml )