Write firmware file micro version to manifest for cAVS platforms - #92
Conversation
aiChaoSONG
left a comment
There was a problem hiding this comment.
LGTM, but I suggest two things:
- compile sof firmware, and read the firmware with sof_ri_info tool to check if the sof_micro number is really there
- compile sof firmware, and put it to windows to see if there is any error.
|
| &image.fw_ver_micro); | ||
|
|
||
| if (ret != 2) { | ||
| if (ret != 3) { |
There was a problem hiding this comment.
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");There was a problem hiding this comment.
@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.
4245792 to
6390abb
Compare
SOF CMake can extract FW file version from latest git tag and defines SOF_MAJOR, SOF_MINOR and SOF_MICRO for 3 version fields. But rimage only gets major and minor version from SOF CMake and writes them into the standard firmware manifest header of cAVS platforms. This patch make rimage also get the micro version from SOF CMake, and write it to the unused hotfix_version field of manifest header. This update will enable sof_ri_info.py to dump entire file version from a FW binary for cAVS platforms. So we can check if a FW release candidate is built from the correct git tag. Signed-off-by: mengdonglin <mengdong.lin@intel.com> update
|
@mengdonglin rimage submodule will need an update PR for sof. Thanks |
@lgirdwood Thank you! I submitted PR thesofproject/sof#5791 to update rimage submodule commit for SOF. Please review. |
Fix #90
This is v2 of #91
SOF CMake can extract FW file version from latest git tag and defines
SOF_MAJOR, SOF_MINOR and SOF_MICRO for 3 version fields. But rimage only
gets major and minor version from SOF CMake and writes them into the
standard firmware manifest header of cAVS platforms.
This patch make rimage also get the micro version from SOF CMake, and
write it to the unused hotfix_version field of manifest header.
This update will enable sof_ri_info.py to dump entire file version from
a FW binary for cAVS platforms. So we can check if a FW release candidate
is built from the correct git tag.
Updates from v1: