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

xtensa-build-zephyr: remove ipc option 

For legacy CAVS platforms (TGL/ADL/EHL), the default
build config is IPC4 now, and the overlay file is
already emptied. Remove the option in this build
script.

Signed-off-by: Chao Song <chao.song@linux.intel.com>
This commit is contained in:
Chao Song 2023-09-18 15:39:27 +08:00 committed by Kai Vehmanen
parent 5004d0fe1e
commit a17c2823d3
1 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -176,9 +176,6 @@ def parse_args():
help="List of platforms to build")
parser.add_argument("-d", "--debug", required=False, action="store_true",
help="Shortcut for: -o sof/app/debug_overlay.conf")
parser.add_argument("-i", "--ipc", required=False, choices=["IPC4"],
help="""Applies --overlay <platform>/ipc4_overlay.conf
and a different rimage config. Valid only for IPC3 platforms supporting IPC4 too.""")
# NO SOF release will ever user the option --fw-naming.
# This option is only for disguising SOF IPC4 as CAVS IPC4 and only in cases where
# the kernel 'ipc_type' expects CAVS IPC4. In this way, developers and CI can test
@ -265,10 +262,6 @@ This should be used with programmatic script invocations (eg. Continuous Integra
if not args.use_platform_subdir:
args.use_platform_subdir=True
warnings.warn("The option '--fw-naming AVS' has to be used with '--use-platform-subdir'. Enable '--use-platform-subdir' automatically.")
if args.ipc != "IPC4":
args.ipc="IPC4"
warnings.warn("The option '--fw-naming AVS' has to be used with '-i IPC4'. Enable '-i IPC4' automatically.")
def execute_command(*run_args, **run_kwargs):
"""[summary] Provides wrapper for subprocess.run that prints
@ -626,7 +619,7 @@ def rimage_options(platform_dict):
# test_00_01_load_fw_and_check_version
opts.append(("-b", "1"))
if args.ipc == "IPC4":
if platform_dict.get("IPC4_RIMAGE_DESC", None) is not None:
rimage_desc = platform_dict["IPC4_RIMAGE_DESC"]
else:
rimage_desc = platform_dict["name"] + ".toml"
@ -725,13 +718,6 @@ def build_platforms():
if args.debug:
overlays.append(str(pathlib.Path(SOF_TOP, "app", "debug_overlay.conf")))
# The '-i IPC4' is a shortcut for '-o path_to_ipc4_overlay' (and more), we
# are good if both are provided, because it's no harm to merge the same
# overlay twice.
if args.ipc == "IPC4":
overlays.append(str(pathlib.Path(SOF_TOP, "app", "overlays", platform,
platform_dict["IPC4_CONFIG_OVERLAY"])))
if overlays:
overlays = ";".join(overlays)
build_cmd.append(f"-DOVERLAY_CONFIG={overlays}")