diff options
author | Juan Castillo <juan.castillo@arm.com> | 2015-12-10 15:49:17 +0000 |
---|---|---|
committer | Juan Castillo <juan.castillo@arm.com> | 2015-12-14 12:31:16 +0000 |
commit | f59821d51255f14e0ac00eef7bc98ef75c686876 (patch) | |
tree | 2a62aec945a1c30ed695ba2a3336c08d94183ab3 /docs/trusted-board-boot.md | |
parent | 516beb585c23056820a854b12c77a6f62cbc5c8b (diff) |
Replace all SCP FW (BL0, BL3-0) references
This patch replaces all references to the SCP Firmware (BL0, BL30,
BL3-0, bl30) with the image terminology detailed in the TF wiki
(https://github.com/ARM-software/arm-trusted-firmware/wiki):
BL0 --> SCP_BL1
BL30, BL3-0 --> SCP_BL2
bl30 --> scp_bl2
This change affects code, documentation, build system, tools and
platform ports that load SCP firmware. ARM plaforms have been
updated to the new porting API.
IMPORTANT: build option to specify the SCP FW image has changed:
BL30 --> SCP_BL2
IMPORTANT: This patch breaks compatibility for platforms that use BL2
to load SCP firmware. Affected platforms must be updated as follows:
BL30_IMAGE_ID --> SCP_BL2_IMAGE_ID
BL30_BASE --> SCP_BL2_BASE
bl2_plat_get_bl30_meminfo() --> bl2_plat_get_scp_bl2_meminfo()
bl2_plat_handle_bl30() --> bl2_plat_handle_scp_bl2()
Change-Id: I24c4c1a4f0e4b9f17c9e4929da815c4069549e58
Diffstat (limited to 'docs/trusted-board-boot.md')
-rw-r--r-- | docs/trusted-board-boot.md | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/docs/trusted-board-boot.md b/docs/trusted-board-boot.md index 1cfa843d..cd999e5c 100644 --- a/docs/trusted-board-boot.md +++ b/docs/trusted-board-boot.md @@ -66,7 +66,7 @@ The keys used to establish the CoT are: * **Trusted world key** The private part is used to sign the key certificates corresponding to the - secure world images (BL3-0, BL3-1 and BL3-2). The public part is stored in + secure world images (SCP_BL2, BL3-1 and BL3-2). The public part is stored in one of the extension fields in the trusted world certificate. * **Non-trusted world key** @@ -77,15 +77,15 @@ The keys used to establish the CoT are: * **BL3-X keys** - For each of BL3-0, BL3-1, BL3-2 and BL3-3, the private part is used to sign - the content certificate for the BL3-X image. The public part is stored in - one of the extension fields in the corresponding key certificate. + For each of SCP_BL2, BL3-1, BL3-2 and BL3-3, the private part is used to + sign the content certificate for the BL3-X image. The public part is stored + in one of the extension fields in the corresponding key certificate. The following images are included in the CoT: * BL1 * BL2 -* BL3-0 (optional) +* SCP_BL2 (optional) * BL3-1 * BL3-3 * BL3-2 (optional) @@ -103,14 +103,15 @@ The following certificates are used to authenticate the images. public part of the trusted world key and the public part of the non-trusted world key. -* **BL3-0 key certificate** +* **SCP_BL2 key certificate** It is self-signed with the trusted world key. It contains the public part of - the BL3-0 key. + the SCP_BL2 key. -* **BL3-0 content certificate** +* **SCP_BL2 content certificate** - It is self-signed with the BL3-0 key. It contains a hash of the BL3-0 image. + It is self-signed with the SCP_BL2 key. It contains a hash of the SCP_BL2 + image. * **BL3-1 key certificate** @@ -139,8 +140,8 @@ The following certificates are used to authenticate the images. It is self-signed with the BL3-3 key. It contains a hash of the BL3-3 image. -The BL3-0 and BL3-2 certificates are optional, but they must be present if the -corresponding BL3-0 or BL3-2 images are present. +The SCP_BL2 and BL3-2 certificates are optional, but they must be present if the +corresponding SCP_BL2 or BL3-2 images are present. 3. Trusted Board Boot Sequence @@ -167,9 +168,9 @@ if any of the steps fail. registers. If the comparison succeeds, BL2 reads and saves the trusted and non-trusted world public keys from the verified certificate. -The next two steps are executed for each of the BL3-0, BL3-1 & BL3-2 images. The -steps for the optional BL3-0 and BL3-2 images are skipped if these images are -not present. +The next two steps are executed for each of the SCP_BL2, BL3-1 & BL3-2 images. +The steps for the optional SCP_BL2 and BL3-2 images are skipped if these images +are not present. * BL2 loads and verifies the BL3-x key certificate. The certificate signature is verified using the trusted world public key. If the signature |