OrgACRN
/
sof
mirror of https://github.com/thesofproject/sof.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

xtensa-build-zephyr.py: do not CMake-reconfigure rimage every time 

It's pointless and hardcodes the CMake generator.

Also remove wrong comment added in commit
6cba64d2cb ("xtensa-build-zephyr.py: fix a few minor pylint warnings")
The rimage part of the comment was flat out wrong.
The smex part of the comment is correct but in the wrong place.

Signed-off-by: Marc Herbert <marc.herbert@intel.com>
This commit is contained in:
Marc Herbert 2022-12-06 20:37:01 +00:00 committed by Liam Girdwood
parent af5d5545fe
commit 2fcab330b9
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
scripts/xtensa-build-zephyr.py
View File

@ -586,8 +586,6 @@ def build_platforms():
else: # unknown failure else: # unknown failure
raise cpe raise cpe
# Building smex and rimage once per platform is a small waste of time
# but it saves a lot of code in this script.
smex_executable = pathlib.Path(west_top, platform_build_dir_name, "zephyr", "smex_ep", smex_executable = pathlib.Path(west_top, platform_build_dir_name, "zephyr", "smex_ep",
"build", "smex") "build", "smex")
fw_ldc_file = pathlib.Path(sof_platform_output_dir, f"sof-{platform}.ldc") fw_ldc_file = pathlib.Path(sof_platform_output_dir, f"sof-{platform}.ldc")
@ -614,10 +612,11 @@ def build_platforms():
Move non-west {nested_rimage} out of west workspace {west_top}. Move non-west {nested_rimage} out of west workspace {west_top}.
See output of 'west list'.""" See output of 'west list'."""
) )
execute_command(["cmake", "-B", rimage_dir_name, "-S", str(rimage_source_dir)],
cwd=west_top)
# CMake build rimage module # CMake build rimage module
if not (pathlib.Path(west_top) / rimage_dir_name / "CMakeCache.txt").is_file():
execute_command(["cmake", "-B", rimage_dir_name,
"-S", str(rimage_source_dir)],
cwd=west_top)
rimage_build_cmd = ["cmake", "--build", rimage_dir_name] rimage_build_cmd = ["cmake", "--build", rimage_dir_name]
if args.jobs is not None: if args.jobs is not None:
rimage_build_cmd.append(f"-j{args.jobs}") rimage_build_cmd.append(f"-j{args.jobs}")