Skip to content

Write firmware file micro version to manifest for cAVS platforms #92

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
lgirdwood merged 1 commit into from
May 9, 2022
Merged

Write firmware file micro version to manifest for cAVS platforms #92

Show file tree
Hide file tree
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
1 change: 1 addition & 0 deletions src/include/rimage/rimage.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ struct image {
char* fw_ver_build_string;
uint16_t fw_ver_major;
uint16_t fw_ver_minor;
uint16_t fw_ver_micro;
uint16_t fw_ver_build;
};

Expand Down
7 changes: 7 additions & 0 deletions src/manifest.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -776,6 +776,7 @@ int man_write_fw_v1_5(struct image *image)
/* firmware and build version */
m->desc.header.major_version = image->fw_ver_major;
m->desc.header.minor_version = image->fw_ver_minor;
m->desc.header.hotfix_version = image->fw_ver_micro;
m->desc.header.build_version = image->fw_ver_build;

/* create each module */
Expand Down Expand Up @@ -845,6 +846,7 @@ int man_write_fw_v1_5_sue(struct image *image)
/* firmware and build version */
m->desc.header.major_version = image->fw_ver_major;
m->desc.header.minor_version = image->fw_ver_minor;
m->desc.header.hotfix_version = image->fw_ver_micro;
m->desc.header.build_version = image->fw_ver_build;

/* create each module - subtract the boot loader exec header */
Expand Down Expand Up @@ -916,6 +918,7 @@ int man_write_fw_v1_8(struct image *image)
m->css.version.build_version = image->fw_ver_build;
m->desc.header.major_version = image->fw_ver_major;
m->desc.header.minor_version = image->fw_ver_minor;
m->desc.header.hotfix_version = image->fw_ver_micro;
m->desc.header.build_version = image->fw_ver_build;

/* create each module */
Expand Down Expand Up @@ -1022,6 +1025,7 @@ int man_write_fw_meu_v1_5(struct image *image)
/* firmware and build version */
desc->header.major_version = image->fw_ver_major;
desc->header.minor_version = image->fw_ver_minor;
desc->header.hotfix_version = image->fw_ver_micro;
desc->header.build_version = image->fw_ver_build;

/* create each module */
Expand Down Expand Up @@ -1102,6 +1106,7 @@ int man_write_fw_meu_v1_8(struct image *image)
/* firmware and build version */
desc->header.major_version = image->fw_ver_major;
desc->header.minor_version = image->fw_ver_minor;
desc->header.hotfix_version = image->fw_ver_micro;
desc->header.build_version = image->fw_ver_build;

/* create each module */
Expand Down Expand Up @@ -1182,6 +1187,7 @@ int man_write_fw_meu_v2_5(struct image *image)
/* firmware and build version */
desc->header.major_version = image->fw_ver_major;
desc->header.minor_version = image->fw_ver_minor;
desc->header.hotfix_version = image->fw_ver_micro;
desc->header.build_version = image->fw_ver_build;

/* create each module */
Expand Down Expand Up @@ -1266,6 +1272,7 @@ int man_write_fw_v2_5(struct image *image)
m->css.version.build_version = image->fw_ver_build;
m->desc.header.major_version = image->fw_ver_major;
m->desc.header.minor_version = image->fw_ver_minor;
m->desc.header.hotfix_version = image->fw_ver_micro;
m->desc.header.build_version = image->fw_ver_build;

/* create each module */
Expand Down
14 changes: 8 additions & 6 deletions src/rimage.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ static void usage(char *name)
fprintf(stdout, "\t -r enable relocatable ELF files\n");
fprintf(stdout, "\t -s MEU signing offset, disables rimage signing\n");
fprintf(stdout, "\t -i set IMR type\n");
fprintf(stdout, "\t -f firmware version = x.y\n");
fprintf(stdout, "\t -f firmware version = major.minor.micro\n");
fprintf(stdout, "\t -b build version\n");
fprintf(stdout, "\t -e build extended manifest\n");
fprintf(stdout, "\t -y verify signed file\n");
Expand Down Expand Up @@ -115,19 +115,21 @@ int main(int argc, char *argv[])
return -EINVAL;
}

/* firmware version and build id */
/* firmware version: major.minor.micro */
if (image.fw_ver_string) {
ret = sscanf(image.fw_ver_string, "%hu.%hu",
ret = sscanf(image.fw_ver_string, "%hu.%hu.%hu",
&image.fw_ver_major,
&image.fw_ver_minor);
&image.fw_ver_minor,
&image.fw_ver_micro);

if (ret != 2) {
if (ret != 3) {

@marc-hb marc-hb May 5, 2022

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

It would be very useful to change the error message a bit. So when there is SOF + rimage mismatch (which will happen in some places) the build failure message is enough to immediately make the difference between an old, 2-fields rimage versus a new, 3 fields rimage. No need to go and try to guess the git versions that were used.

fprintf(stderr,
   "error: cannot parse firmware version major.minor.micro\n");

@mengdonglin mengdonglin May 6, 2022

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

@marc-hb Thank you! I updated the PR to revise the error message as you suggested. The help message for file version is also updated.

fprintf(stderr,
"error: cannot parse firmware version\n");
"error: cannot parse firmware version major.minor.micro\n");
return -EINVAL;
}
}

/* firmware build id */
if (image.fw_ver_build_string) {
ret = sscanf(image.fw_ver_build_string, "%hu",
&image.fw_ver_build);
Expand Down