Skip to content

xtensa-build-zephyr: pass sof build version to rimage #6276

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
mwasko merged 1 commit into from
Sep 15, 2022
Merged

xtensa-build-zephyr: pass sof build version to rimage #6276

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
34 changes: 21 additions & 13 deletions scripts/xtensa-build-zephyr.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@
west_top = pathlib.Path(SOF_TOP, "..").resolve()
default_rimage_key = pathlib.Path(SOF_TOP, "keys", "otc_private_key.pem")

sof_version = None
sof_fw_version = None
sof_build_version = None

if py_platform.system() == "Windows":
xtensa_tools_version_postfix = "-win32"
Expand Down Expand Up @@ -387,16 +388,17 @@ def west_update():
execute_command(["west", "update"], check=True, timeout=3000, cwd=west_top)


def get_sof_version(abs_build_dir):
"""[summary] Get version string major.minor.micro of SOF firmware
file. When building multiple platforms from the same SOF commit,
all platforms share the same version. So for the 1st platform,
generate the version string from sof_version.h and later platforms
will reuse it.
def get_build_and_sof_version(abs_build_dir):
"""[summary] Get version string major.minor.micro and build of SOF
firmware file. When building multiple platforms from the same SOF
commit, all platforms share the same version. So for the 1st platform,
generate the version string from sof_version.h and later platforms will
reuse it.
"""
global sof_version
if sof_version:
return sof_version
global sof_fw_version
global sof_build_version
Copy link
Collaborator

@marc-hb marc-hb Sep 12, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm fairly confident you don't need these global declarations. Otherwise looks good to me.

EDIT: just realized the first global was already there. Still, please take the opportunity to fix this while you're changing this code (or prove me wrong).

EDIT2: wrong!

if sof_fw_version and sof_build_version:
return sof_fw_version, sof_build_version

versions = {}
with open(pathlib.Path(abs_build_dir,
Expand All @@ -405,9 +407,11 @@ def get_sof_version(abs_build_dir):
words = hline.split()
if words[0] == '#define':
versions[words[1]] = words[2]
sof_version = versions['SOF_MAJOR'] + '.' + versions['SOF_MINOR'] + '.' + \
sof_fw_version = versions['SOF_MAJOR'] + '.' + versions['SOF_MINOR'] + '.' + \
versions['SOF_MICRO']
return sof_version
sof_build_version = versions['SOF_BUILD']

return sof_fw_version, sof_build_version

def build_platforms():
global west_top, SOF_TOP
Expand Down Expand Up @@ -540,7 +544,11 @@ def build_platforms():

sign_cmd += ["--tool-data", str(rimage_config), "--", "-k", str(signing_key)]

sign_cmd += ["-f", get_sof_version(abs_build_dir)]
sof_fw_version, sof_build_version = get_build_and_sof_version(abs_build_dir)

sign_cmd += ["-f", sof_fw_version]

sign_cmd += ["-b", sof_build_version]

if args.fw_naming == "AVS":
output_fwname="dsp_basefw.bin"
Expand Down