LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

binman: openssl: x509: Support bootcore_opts 

Support bootcore_opts field in x509 template. The bootcore_opts argument
had been defined earlier but not utilised into the final certificate.

Fixes: d43c636437 ("binman: openssl: x509: ti_secure_rom: Add support for bootcore_opts")
Signed-off-by: Neha Malcom Francis <n-francis@ti.com>
This commit is contained in:
Neha Malcom Francis 2023-10-12 15:34:20 +05:30 committed by Udit Kumar
parent 83d1a76338
commit 7252c55a3f
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tools/binman/btool/openssl.py
View File

@ -238,7 +238,7 @@ emailAddress = {req_dist_name_dict['emailAddress']}
imagesize_sbl, hashval_sbl, load_addr_sysfw, imagesize_sysfw, imagesize_sbl, hashval_sbl, load_addr_sysfw, imagesize_sysfw,
hashval_sysfw, load_addr_sysfw_data, imagesize_sysfw_data, hashval_sysfw, load_addr_sysfw_data, imagesize_sysfw_data,
hashval_sysfw_data, sysfw_inner_cert_ext_boot_block, hashval_sysfw_data, sysfw_inner_cert_ext_boot_block,
dm_data_ext_boot_block): dm_data_ext_boot_block, bootcore_opts):
"""Create a certificate """Create a certificate
Args: Args:
@ -254,6 +254,7 @@ emailAddress = {req_dist_name_dict['emailAddress']}
bootcore (int): Booting core bootcore (int): Booting core
load_addr (int): Load address of image load_addr (int): Load address of image
sha (int): Hash function sha (int): Hash function
bootcore_opts (int): Boot core option (split/lockstep mode)
Returns: Returns:
str: Tool output str: Tool output
@ -298,7 +299,7 @@ sysfw_data=SEQUENCE:sysfw_data
[sbl] [sbl]
compType = INTEGER:1 compType = INTEGER:1
bootCore = INTEGER:16 bootCore = INTEGER:16
compOpts = INTEGER:0 compOpts = INTEGER:{bootcore_opts}
destAddr = FORMAT:HEX,OCT:{load_addr:08x} destAddr = FORMAT:HEX,OCT:{load_addr:08x}
compSize = INTEGER:{imagesize_sbl} compSize = INTEGER:{imagesize_sbl}
shaType = OID:{sha_type} shaType = OID:{sha_type}

3
tools/binman/etype/x509_cert.py
View File

@ -137,7 +137,8 @@ class Entry_x509_cert(Entry_collection):
imagesize_sysfw_data=self.imagesize_sysfw_data, imagesize_sysfw_data=self.imagesize_sysfw_data,
hashval_sysfw_data=self.hashval_sysfw_data, hashval_sysfw_data=self.hashval_sysfw_data,
sysfw_inner_cert_ext_boot_block=self.sysfw_inner_cert_ext_boot_block, sysfw_inner_cert_ext_boot_block=self.sysfw_inner_cert_ext_boot_block,
dm_data_ext_boot_block=self.dm_data_ext_boot_block dm_data_ext_boot_block=self.dm_data_ext_boot_block,
bootcore_opts=self.bootcore_opts
) )
if stdout is not None: if stdout is not None:
data = tools.read_file(output_fname) data = tools.read_file(output_fname)