Skip to content

xtensa-build-zephyr.py: resolve relative --key arguments #7721

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

Merged
kv2019i merged 2 commits into from
Jun 2, 2023
Merged

xtensa-build-zephyr.py: resolve relative --key arguments #7721

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a7c1d0d
xtensa-build-zephyr.py: resolve relative --key arguments
marc-hb May 31, 2023
14dcb00
xtensa-build-zephyr.py: remove `default_rimage_key` dead code
marc-hb May 31, 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
12 changes: 6 additions & 6 deletions scripts/xtensa-build-zephyr.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@
# Constant value resolves SOF_TOP directory as: "this script directory/.."
SOF_TOP = pathlib.Path(__file__).parents[1].resolve()
west_top = pathlib.Path(SOF_TOP, "..").resolve()
default_rimage_key = pathlib.Path(SOF_TOP, "keys", "otc_private_key.pem")

sof_fw_version = None

Expand Down Expand Up @@ -587,15 +586,16 @@ def rimage_options(platform_dict):
if args.verbose > 0:
opts.append(("-v",) * args.verbose)

signing_key = ""
signing_key = None
if args.key:
signing_key = args.key
key_path = pathlib.Path(args.key)
assert key_path.exists(), f"{key_path} not found"
signing_key = key_path.resolve()
elif "RIMAGE_KEY" in platform_dict:
signing_key = platform_dict["RIMAGE_KEY"]
else:
signing_key = default_rimage_key

opts.append(("-k", str(signing_key)))
if signing_key is not None:
opts.append(("-k", str(signing_key)))

sof_fw_vers = get_sof_version()

Expand Down