feat(measured_boot): image hash measurement and recording in BL1
It looks safer and cleaner approach to record the measurement taken by
BL1 straightaway in TCG Event Log instead of deferring these recordings
to BL2.
Hence pull in the full-fledged measured boot driver into BL1 that
replaces the former ad-hoc platform interfaces i.e.
bl1_plat_set_bl2_hash, bl2_plat_get_hash.
As a result of this change the BL1 of Arm FVP platform now do the
measurements and recordings of below images:
1. FW_CONFIG
2. TB_FW_CONFIG
3. BL2
Change-Id: I798c20336308b5e91b547da4f8ed57c24d490731
Signed-off-by: Manish V Badarkhe <Manish.Badarkhe@arm.com>
diff --git a/common/bl_common.c b/common/bl_common.c
index 3c37bcf..eb2352a 100644
--- a/common/bl_common.c
+++ b/common/bl_common.c
@@ -203,7 +203,6 @@
}
if (is_parent_image == 0) {
-#if IMAGE_BL2
/*
* Measure the image.
* We do not measure its parents because these only play a role
@@ -212,11 +211,11 @@
* TODO: Change this code if we change our minds about measuring
* certificates.
*/
- rc = plat_mboot_measure_image(image_id);
+ rc = plat_mboot_measure_image(image_id, image_data);
if (rc != 0) {
return rc;
}
-#endif
+
/*
* Flush the image to main memory so that it can be executed
* later by any CPU, regardless of cache and MMU state. This