From 4e74d2b6067887e1ab803bedb772aad3f7bd8e25 Mon Sep 17 00:00:00 2001 From: Marc Herbert Date: Mon, 23 Oct 2023 09:59:55 -0700 Subject: [PATCH 1/2] .github/zephyr: de-hardcode the remote name in the Windows build too Fixes commit 4bc6488b24e44 (".github/zephyr: de-hardcode the name of the zephyr remote") (Yay for duplication) Signed-off-by: Marc Herbert (cherry picked from commit d661616892e591948d4533ffd9221784c8e424f8) Signed-off-by: Kai Vehmanen --- .github/workflows/zephyr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/zephyr.yml b/.github/workflows/zephyr.yml index dd9f10704b3e..f1ee5bdb4268 100644 --- a/.github/workflows/zephyr.yml +++ b/.github/workflows/zephyr.yml @@ -310,7 +310,7 @@ jobs: # Get some tags to fix `git describe`, see build-linux comments above. cd zephyr $_rev = "$(git rev-parse HEAD)" - git fetch --filter=tree:0 zephyrproject "${_rev}:_branch_placeholder" + git fetch --filter=tree:0 "$(west list -f '{url}' zephyr)" "${_rev}:_branch_placeholder" git branch -D _branch_placeholder From ec0667a2b4fc6228565c979630704246ac008e9b Mon Sep 17 00:00:00 2001 From: Chao Song Date: Mon, 18 Sep 2023 15:39:27 +0800 Subject: [PATCH 2/2] 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 (cherry picked from commit a17c2823d376487d1f78ed3f80e6f93e7288bc92) Signed-off-by: Kai Vehmanen --- scripts/xtensa-build-zephyr.py | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/scripts/xtensa-build-zephyr.py b/scripts/xtensa-build-zephyr.py index 8a2b3532708a..5f8cdd5ce361 100755 --- a/scripts/xtensa-build-zephyr.py +++ b/scripts/xtensa-build-zephyr.py @@ -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 /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 @@ def parse_args(): 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}")