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

xtensa-build-zephyr.py: extract new function install_platform() 

Zero functional change.

Lowers the score of the following pylint warnings:

- Too many local variables (38/15) (too-many-locals)  41->38
- Too many branches (26/12) (too-many-branches)       29->26
- Too many statements (116/50)(too-many-statements)  127->116

Keep existing indentation for now to help git blame -Mnn. Will fix in next
commit.

Signed-off-by: Marc Herbert <marc.herbert@intel.com>
This commit is contained in:
Marc Herbert 2022-10-25 00:19:30 +00:00 committed by Liam Girdwood
parent 61fe7da105
commit 4f98441d3c
1 changed files with 29 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -622,26 +622,7 @@ def build_platforms():
if platform not in RI_INFO_UNSUPPORTED:
reproducible_checksum(platform, west_top / platform_build_dir_name / "zephyr" / "zephyr.ri")
# Install to STAGING_DIR
abs_build_dir = pathlib.Path(west_top) / platform_build_dir_name / "zephyr"
if args.fw_naming == "AVS":
# Disguise ourselves for local testing purposes
output_fwname="dsp_basefw.bin"
else:
# Regular name
output_fwname="".join(["sof-", platform, ".ri"])
shutil.copy2(abs_build_dir / "zephyr.ri", abs_build_dir / output_fwname)
fw_file_to_copy = abs_build_dir / output_fwname
install_key_dir = sof_platform_output_dir
if args.key_type_subdir != "none":
install_key_dir = install_key_dir / args.key_type_subdir
os.makedirs(install_key_dir, exist_ok=True)
# looses file owner and group - file is commonly accessible
shutil.copy2(fw_file_to_copy, install_key_dir)
install_platform(platform, sof_platform_output_dir)
src_dest_list = []
@ -672,6 +653,34 @@ def build_platforms():
tools_output_dir,
symlinks=True, ignore_dangling_symlinks=True, dirs_exist_ok=True)
def install_platform(platform, sof_platform_output_dir):
# Keep in sync with caller
platform_build_dir_name = f"build-{platform}"
# Install to STAGING_DIR
abs_build_dir = pathlib.Path(west_top) / platform_build_dir_name / "zephyr"
if args.fw_naming == "AVS":
# Disguise ourselves for local testing purposes
output_fwname="dsp_basefw.bin"
else:
# Regular name
output_fwname="".join(["sof-", platform, ".ri"])
shutil.copy2(abs_build_dir / "zephyr.ri", abs_build_dir / output_fwname)
fw_file_to_copy = abs_build_dir / output_fwname
install_key_dir = sof_platform_output_dir
if args.key_type_subdir != "none":
install_key_dir = install_key_dir / args.key_type_subdir
os.makedirs(install_key_dir, exist_ok=True)
# looses file owner and group - file is commonly accessible
shutil.copy2(fw_file_to_copy, install_key_dir)
# As of October 2022, sof_ri_info.py expects .ri files to include a CSE manifest / signature.
# Don't run sof_ri_info and ignore silently .ri files that don't have one.
RI_INFO_UNSUPPORTED = []