OrgACRN
/
sof
mirror of https://github.com/thesofproject/sof.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

rimage: add correct FW version to binary 

Now correct FW version is included into binary.

Signed-off-by: Tomasz Lauda <tomasz.lauda@linux.intel.com>
This commit is contained in:
Tomasz Lauda 2018-06-04 12:03:41 +01:00 committed by Liam Girdwood
parent a88530a11c
commit e499997302
3 changed files with 22 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -44,5 +44,7 @@ doc-dummy:
doc: doc-dummy doc: doc-dummy
$(MAKE) -C doc doc $(MAKE) -C doc doc
if !BUILD_RIMAGE
all-local: all-local:
rm -f $(top_srcdir)/src/include/version.h rm -f $(top_srcdir)/src/include/version.h
endif

24
rimage/man_apl.c
View File

@ -15,12 +15,8 @@
#include "cse.h" #include "cse.h"
#include "plat_auth.h" #include "plat_auth.h"
#include "manifest.h" #include "manifest.h"
#include <config.h>
/* hard coded atm - will pass this in from cmd line and git */ #include <version.h>
#define MAN_FW_HDR_VERSION_MAJOR 9
#define MAN_FW_HDR_VERSION_MINOR 22
#define MAN_FW_HDR_VERSION_HOTFIX 1
#define MAN_FW_HDR_VERSION_BUILD 0x7da
/* manifest template */ /* manifest template */
struct fw_image_manifest apl_manifest = { struct fw_image_manifest apl_manifest = {
@ -65,10 +61,10 @@ struct fw_image_manifest apl_manifest = {
.header_id = MAN_CSS_HDR_ID, .header_id = MAN_CSS_HDR_ID,
.padding = 0, .padding = 0,
.version = { .version = {
.major_version = MAN_FW_HDR_VERSION_MAJOR, .major_version = SOF_MAJOR,
.minor_version = MAN_FW_HDR_VERSION_MINOR, .minor_version = SOF_MINOR,
.hotfix_version = MAN_FW_HDR_VERSION_HOTFIX, .hotfix_version = 0,
.build_version = MAN_FW_HDR_VERSION_BUILD, .build_version = SOF_BUILD,
}, },
.modulus_size = MAN_CSS_MOD_SIZE, .modulus_size = MAN_CSS_MOD_SIZE,
.exponent_size = MAN_CSS_EXP_SIZE, .exponent_size = MAN_CSS_EXP_SIZE,
@ -134,10 +130,10 @@ struct fw_image_manifest apl_manifest = {
.preload_page_count = 0, /* size in pages from $CPD */ .preload_page_count = 0, /* size in pages from $CPD */
.fw_image_flags = SOF_MAN_FW_HDR_FLAGS, .fw_image_flags = SOF_MAN_FW_HDR_FLAGS,
.feature_mask = SOF_MAN_FW_HDR_FEATURES, .feature_mask = SOF_MAN_FW_HDR_FEATURES,
.major_version = MAN_FW_HDR_VERSION_MAJOR, .major_version = SOF_MAJOR,
.minor_version = MAN_FW_HDR_VERSION_MINOR, .minor_version = SOF_MINOR,
.hotfix_version = MAN_FW_HDR_VERSION_HOTFIX, .hotfix_version = 0,
.build_version = MAN_FW_HDR_VERSION_BUILD, .build_version = SOF_BUILD,
.load_offset = MAN_DESC_OFFSET, .load_offset = MAN_DESC_OFFSET,
}, },
}, },

24
rimage/man_cnl.c
View File

@ -15,12 +15,8 @@
#include "cse.h" #include "cse.h"
#include "plat_auth.h" #include "plat_auth.h"
#include "manifest.h" #include "manifest.h"
#include <config.h>
/* hard coded atm - will pass this in from cmd line and git */ #include <version.h>
#define MAN_FW_HDR_VERSION_MAJOR 10
#define MAN_FW_HDR_VERSION_MINOR 23
#define MAN_FW_HDR_VERSION_HOTFIX 0
#define MAN_FW_HDR_VERSION_BUILD 0x2a4
/* manifest template */ /* manifest template */
struct fw_image_manifest cnl_manifest = { struct fw_image_manifest cnl_manifest = {
@ -64,10 +60,10 @@ struct fw_image_manifest cnl_manifest = {
.header_id = MAN_CSS_HDR_ID, .header_id = MAN_CSS_HDR_ID,
.padding = 0, .padding = 0,
.version = { .version = {
.major_version = MAN_FW_HDR_VERSION_MAJOR, .major_version = SOF_MAJOR,
.minor_version = MAN_FW_HDR_VERSION_MINOR, .minor_version = SOF_MINOR,
.hotfix_version = MAN_FW_HDR_VERSION_HOTFIX, .hotfix_version = 0,
.build_version = MAN_FW_HDR_VERSION_BUILD, .build_version = SOF_BUILD,
}, },
.modulus_size = MAN_CSS_MOD_SIZE, .modulus_size = MAN_CSS_MOD_SIZE,
.exponent_size = MAN_CSS_EXP_SIZE, .exponent_size = MAN_CSS_EXP_SIZE,
@ -133,10 +129,10 @@ struct fw_image_manifest cnl_manifest = {
.preload_page_count = 0, /* size in pages from $CPD */ .preload_page_count = 0, /* size in pages from $CPD */
.fw_image_flags = SOF_MAN_FW_HDR_FLAGS, .fw_image_flags = SOF_MAN_FW_HDR_FLAGS,
.feature_mask = SOF_MAN_FW_HDR_FEATURES, .feature_mask = SOF_MAN_FW_HDR_FEATURES,
.major_version = MAN_FW_HDR_VERSION_MAJOR, .major_version = SOF_MAJOR,
.minor_version = MAN_FW_HDR_VERSION_MINOR, .minor_version = SOF_MINOR,
.hotfix_version = MAN_FW_HDR_VERSION_HOTFIX, .hotfix_version = 0,
.build_version = MAN_FW_HDR_VERSION_BUILD, .build_version = SOF_BUILD,
.load_offset = 0x30000, .load_offset = 0x30000,
}, },
}, },