diff --git a/scripts/xtensa-build-zephyr.py b/scripts/xtensa-build-zephyr.py index 4f1deed0eb26..4914120170c3 100755 --- a/scripts/xtensa-build-zephyr.py +++ b/scripts/xtensa-build-zephyr.py @@ -877,16 +877,6 @@ def build_platforms(): else: # unknown failure raise cpe - smex_executable = pathlib.Path(west_top, platform_build_dir_name, "zephyr", "smex_ep", - "build", "smex") - fw_ldc_file = pathlib.Path(sof_platform_output_dir, f"sof-{platform}.ldc") - input_elf_file = pathlib.Path(west_top, platform_build_dir_name, "zephyr", "zephyr.elf") - # Extract metadata - execute_command([str(smex_executable), "-l", str(fw_ldc_file), str(input_elf_file)]) - - for p_alias in platform_configs[platform].aliases: - symlink_or_copy(sof_platform_output_dir, f"sof-{platform}.ldc", sof_platform_output_dir, f"sof-{p_alias}.ldc") - # reproducible-zephyr.ri is less useful now that show_installed_files() shows # checksums too. However: - it's still useful when only the .ri file is # available (no build logs for the other image), - it makes sure sof_ri_info.py @@ -900,15 +890,6 @@ def build_platforms(): src_dest_list = [] tools_output_dir = pathlib.Path(STAGING_DIR, "tools") - # Install sof-logger from the last platform built (requires building at least one platform). - if platform_build_dir_name: - sof_logger_dir = pathlib.Path(west_top, platform_build_dir_name, "zephyr", - "sof-logger_ep", "build", "logger") - sof_logger_executable_to_copy = pathlib.Path(shutil.which("sof-logger", path=sof_logger_dir)) - sof_logger_installed_file = pathlib.Path(tools_output_dir, sof_logger_executable_to_copy.name).resolve() - - src_dest_list += [(sof_logger_executable_to_copy, sof_logger_installed_file)] - src_dest_list += [(pathlib.Path(SOF_TOP) / "tools" / "mtrace"/ "mtrace-reader.py", tools_output_dir / "mtrace-reader.py")] diff --git a/zephyr/CMakeLists.txt b/zephyr/CMakeLists.txt index 7e6014c12841..2e7331fe827f 100644 --- a/zephyr/CMakeLists.txt +++ b/zephyr/CMakeLists.txt @@ -128,27 +128,6 @@ set(RIMAGE_TOP ${sof_top_dir}/tools/rimage) set(RIMAGE_CONFIG_PATH ${RIMAGE_TOP}/config CACHE PATH " Path to rimage board configuration files") -include(ExternalProject) - -ExternalProject_Add(smex_ep - SOURCE_DIR "${ZEPHYR_SOF_MODULE_DIR}/smex/" - # The default paths are very "deep" - PREFIX "${PROJECT_BINARY_DIR}/smex_ep" - BINARY_DIR "${PROJECT_BINARY_DIR}/smex_ep/build" - BUILD_ALWAYS 1 - INSTALL_COMMAND "" # need smex only at build time -) - -ExternalProject_Add(sof_logger_ep - SOURCE_DIR "${ZEPHYR_SOF_MODULE_DIR}/tools/" - # The default paths are very "deep" - PREFIX "${PROJECT_BINARY_DIR}/sof-logger_ep" - BINARY_DIR "${PROJECT_BINARY_DIR}/sof-logger_ep/build" - BUILD_COMMAND cmake --build . --target sof-logger - BUILD_ALWAYS 1 - INSTALL_COMMAND "" -) - # default SOF includes target_include_directories(SOF INTERFACE ${RIMAGE_TOP}/src/include) target_include_directories(SOF INTERFACE ${SOF_SRC_PATH}/include)