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

xtensa-build-zephyr.py: add ipc4 build support for tgl 

Add ipc4 build support for tgl with OVERLAY_CONFIG.

Signed-off-by: Chao Song <chao.song@linux.intel.com>
This commit is contained in:
Chao Song 2022-02-24 14:36:45 +08:00 committed by Liam Girdwood
parent ce050aa25b
commit 6f71808e3e
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
platforms/tgl/tgl_ipc4_overlay.conf Normal file
View File

@ -0,0 +1 @@
CONFIG_IPC_MAJOR_4=y

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

@ -50,6 +50,8 @@ platform_list = [
{ {
"name": "tgl", "name": "tgl",
"PLAT_CONFIG": "intel_adsp_cavs25", "PLAT_CONFIG": "intel_adsp_cavs25",
"IPC4_CONFIG_OVERLAY": "tgl_ipc4_overlay.conf",
"IPC4_RIMAGE_DESC": "tgl-cavs.toml",
"XTENSA_CORE": "cavs2x_LX6HiFi3_2017_8", "XTENSA_CORE": "cavs2x_LX6HiFi3_2017_8",
"XTENSA_TOOLS_VERSION": f"RG-2017.8{xtensa_tools_version_postfix}", "XTENSA_TOOLS_VERSION": f"RG-2017.8{xtensa_tools_version_postfix}",
"RIMAGE_KEY": pathlib.Path("modules", "audio", "sof", "keys", "otc_private_key_3k.pem") "RIMAGE_KEY": pathlib.Path("modules", "audio", "sof", "keys", "otc_private_key_3k.pem")
@ -116,6 +118,8 @@ def parse_args():
help="Build all currently supported platforms") help="Build all currently supported platforms")
parser.add_argument("platforms", nargs="*", action=validate_platforms_arguments, parser.add_argument("platforms", nargs="*", action=validate_platforms_arguments,
help="List of platforms to build") help="List of platforms to build")
parser.add_argument("-i", "--ipc", required=False, choices=["IPC3", "IPC4"],
default="IPC3", help="IPC major version")
parser.add_argument("-j", "--jobs", required=False, type=int, parser.add_argument("-j", "--jobs", required=False, type=int,
default=multiprocessing.cpu_count(), default=multiprocessing.cpu_count(),
help="Set number of make build jobs for rimage." help="Set number of make build jobs for rimage."
@ -350,6 +354,10 @@ def build_platforms():
if args.cmake_args: if args.cmake_args:
build_cmd += args.cmake_args build_cmd += args.cmake_args
if args.ipc == "IPC4":
overlay = pathlib.Path(SOF_TOP, "platforms", platform, platform_dict["IPC4_CONFIG_OVERLAY"])
build_cmd.append(f"-DOVERLAY_CONFIG={overlay}")
# Build # Build
execute_command(build_cmd, check=True, cwd=west_top) execute_command(build_cmd, check=True, cwd=west_top)
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",
@ -385,6 +393,11 @@ def build_platforms():
else: else:
signing_key = default_rimage_key signing_key = default_rimage_key
sign_cmd += ["--tool-data", str(rimage_config), "--", "-k", str(signing_key)] sign_cmd += ["--tool-data", str(rimage_config), "--", "-k", str(signing_key)]
if args.ipc == "IPC4":
rimage_desc = pathlib.Path(SOF_TOP, "rimage", "config", platform_dict["IPC4_RIMAGE_DESC"])
sign_cmd += ["-c", rimage_desc]
execute_command(sign_cmd, check=True, cwd=west_top) execute_command(sign_cmd, check=True, cwd=west_top)
# Install by copy # Install by copy
fw_file_to_copy = pathlib.Path(west_top, platform_build_dir_name, "zephyr", "zephyr.ri") fw_file_to_copy = pathlib.Path(west_top, platform_build_dir_name, "zephyr", "zephyr.ri")