diff options
| author | Summer Qin <summer.qin@arm.com> | 2017-04-20 16:28:39 +0100 |
|---|---|---|
| committer | Edison Ai <edison.ai@arm.com> | 2017-08-09 18:06:05 +0800 |
| commit | 71fb396440f51b21401f24c925b9a97a224a4d24 (patch) | |
| tree | 3d42bb4619181f218107b84b48abf8ed6119bc20 /tools/fiptool | |
| parent | ca9915c2bbce951a2955d4314d255270a8f5a0b3 (diff) | |
Support Trusted OS firmware extra images in TF tools
Since Trusted OS firmware may have extra images, need to
assign new uuid and image id for them.
The TBBR chain of trust has been extended to add support
for the new images within the existing Trusted OS firmware
content certificate.
Change-Id: I678dac7ba1137e85c5779b05e0c4331134c10e06
Signed-off-by: Summer Qin <summer.qin@arm.com>
Diffstat (limited to 'tools/fiptool')
| -rw-r--r-- | tools/fiptool/fip_create.sh | 4 | ||||
| -rw-r--r-- | tools/fiptool/tbbr_config.c | 10 |
2 files changed, 14 insertions, 0 deletions
diff --git a/tools/fiptool/fip_create.sh b/tools/fiptool/fip_create.sh index f1e1f451..0e80199f 100644 --- a/tools/fiptool/fip_create.sh +++ b/tools/fiptool/fip_create.sh @@ -28,6 +28,8 @@ Components that can be added/updated: --scp-fw FILENAME SCP Firmware SCP_BL2 --soc-fw FILENAME EL3 Runtime Firmware BL31 --tos-fw FILENAME Secure Payload BL32 (Trusted OS) + --tos-fw-extra1 FILENAME Secure Payload BL32 Extra1 (Trusted OS Extra1) + --tos-fw-extra2 FILENAME Secure Payload BL32 Extra2 (Trusted OS Extra2) --nt-fw FILENAME Non-Trusted Firmware BL33 --rot-cert FILENAME Root Of Trust key certificate --trusted-key-cert FILENAME Trusted key certificate @@ -69,6 +71,8 @@ while :; do --scp-fw | \ --soc-fw | \ --tos-fw | \ + --tos-fw-extra1 | \ + --tos-fw-extra2 | \ --nt-fw | \ --rot-cert | \ --trusted-key-cert | \ diff --git a/tools/fiptool/tbbr_config.c b/tools/fiptool/tbbr_config.c index 7c6c24be..827cab28 100644 --- a/tools/fiptool/tbbr_config.c +++ b/tools/fiptool/tbbr_config.c @@ -53,6 +53,16 @@ toc_entry_t toc_entries[] = { .cmdline_name = "tos-fw" }, { + .name = "Secure Payload BL32 Extra1 (Trusted OS Extra1)", + .uuid = UUID_SECURE_PAYLOAD_BL32_EXTRA1, + .cmdline_name = "tos-fw-extra1" + }, + { + .name = "Secure Payload BL32 Extra2 (Trusted OS Extra2)", + .uuid = UUID_SECURE_PAYLOAD_BL32_EXTRA2, + .cmdline_name = "tos-fw-extra2" + }, + { .name = "Non-Trusted Firmware BL33", .uuid = UUID_NON_TRUSTED_FIRMWARE_BL33, .cmdline_name = "nt-fw" |