Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[SOF-v2.7] backport fixes for CI builds #8387

Closed
wants to merge 2 commits into from
Closed

[SOF-v2.7] backport fixes for CI builds #8387

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4e74d2b
.github/zephyr: de-hardcode the remote name in the Windows build too
marc-hb Oct 23, 2023
ec0667a
xtensa-build-zephyr: remove ipc option
Sep 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/zephyr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand Down
16 changes: 1 addition & 15 deletions scripts/xtensa-build-zephyr.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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}")
Expand Down
Loading