aboutsummaryrefslogtreecommitdiff
path: root/plat
diff options
context:
space:
mode:
authorSandrine Bailleux <sandrine.bailleux@arm.com>2021-07-05 10:19:19 +0200
committerTrustedFirmware Code Review <review@review.trustedfirmware.org>2021-07-05 10:19:19 +0200
commit9fa5db4da847294f895a85486491ff9c78ed32c8 (patch)
tree318a887237832553315fd8b13681451a7a00b03f /plat
parent7fa35d068ff9eabbf252414fd778cc4de7a4b141 (diff)
parent64dd1dee2da507c0a686dacece81b07487a9a996 (diff)
downloadtrusted-firmware-a-9fa5db4da847294f895a85486491ff9c78ed32c8.tar.gz
Merge changes from topic "sb/measured-boot" into integration
* changes: refactor(plat/fvp): tidy up list of images to measure docs: explain Measured Boot dependency on Trusted Boot
Diffstat (limited to 'plat')
-rw-r--r--plat/arm/board/fvp/fvp_measured_boot.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/plat/arm/board/fvp/fvp_measured_boot.c b/plat/arm/board/fvp/fvp_measured_boot.c
index b145aae58f..5dcadba362 100644
--- a/plat/arm/board/fvp/fvp_measured_boot.c
+++ b/plat/arm/board/fvp/fvp_measured_boot.c
@@ -15,12 +15,10 @@ static const image_data_t fvp_images_data[] = {
{ BL32_EXTRA1_IMAGE_ID, BL32_EXTRA1_IMAGE_STRING, PCR_0 },
{ BL32_EXTRA2_IMAGE_ID, BL32_EXTRA2_IMAGE_STRING, PCR_0 },
{ BL33_IMAGE_ID, BL33_STRING, PCR_0 },
- { GPT_IMAGE_ID, GPT_IMAGE_STRING, PCR_0 },
{ HW_CONFIG_ID, HW_CONFIG_STRING, PCR_0 },
{ NT_FW_CONFIG_ID, NT_FW_CONFIG_STRING, PCR_0 },
{ SCP_BL2_IMAGE_ID, SCP_BL2_IMAGE_STRING, PCR_0 },
{ SOC_FW_CONFIG_ID, SOC_FW_CONFIG_STRING, PCR_0 },
- { STM32_IMAGE_ID, STM32_IMAGE_STRING, PCR_0 },
{ TOS_FW_CONFIG_ID, TOS_FW_CONFIG_STRING, PCR_0 },
{ INVALID_ID, NULL, (unsigned int)(-1) } /* Terminator */
};