diff --git a/drivers/measured_boot/event_log/event_log.c b/drivers/measured_boot/event_log/event_log.c
index 32b7c55..ff771aa 100644
--- a/drivers/measured_boot/event_log/event_log.c
+++ b/drivers/measured_boot/event_log/event_log.c
@@ -87,13 +87,14 @@
  *
  * There must be room for storing this new event into the event log buffer.
  */
-static void event_log_record(const uint8_t *hash, const image_data_t *image_ptr)
+void event_log_record(const uint8_t *hash, const image_data_t *image_ptr)
 {
 	void *ptr = log_ptr;
 	uint32_t name_len;
 
 	assert(image_ptr != NULL);
 	assert(image_ptr->name != NULL);
+	assert(hash != NULL);
 
 	name_len = (uint32_t)strlen(image_ptr->name) + 1U;
 
@@ -126,13 +127,8 @@
 	/* TCG_PCR_EVENT2.Digests[].Digest[] */
 	ptr = (uint8_t *)((uintptr_t)ptr + offsetof(tpmt_ha, digest));
 
-	if (hash == NULL) {
-		/* Get BL2 hash from DTB */
-		bl2_plat_get_hash(ptr);
-	} else {
-		/* Copy digest */
-		(void)memcpy(ptr, (const void *)hash, TCG_DIGEST_SIZE);
-	}
+	/* Copy digest */
+	(void)memcpy(ptr, (const void *)hash, TCG_DIGEST_SIZE);
 
 	/* TCG_PCR_EVENT2.EventSize */
 	ptr = (uint8_t *)((uintptr_t)ptr + TCG_DIGEST_SIZE);
@@ -220,9 +216,6 @@
 	ptr = (uint8_t *)((uintptr_t)ptr + sizeof(startup_locality_event_t));
 
 	log_ptr = (uint8_t *)ptr;
-
-	/* Add BL2 event */
-	event_log_record(NULL, plat_data_ptr->images_data);
 }
 
 /*
diff --git a/include/drivers/measured_boot/event_log/event_log.h b/include/drivers/measured_boot/event_log/event_log.h
index 3530224..96fdc2f 100644
--- a/include/drivers/measured_boot/event_log/event_log.h
+++ b/include/drivers/measured_boot/event_log/event_log.h
@@ -94,4 +94,6 @@
 const measured_boot_data_t *plat_get_measured_boot_data(void);
 int event_log_measure_and_record(uintptr_t data_base, uint32_t data_size,
 				 uint32_t data_id);
+void event_log_record(const uint8_t *hash, const image_data_t *image_ptr);
+
 #endif /* EVENT_LOG_H */
diff --git a/plat/arm/board/fvp/fvp_measured_boot.c b/plat/arm/board/fvp/fvp_measured_boot.c
index 64d4a85..24885f5 100644
--- a/plat/arm/board/fvp/fvp_measured_boot.c
+++ b/plat/arm/board/fvp/fvp_measured_boot.c
@@ -11,6 +11,7 @@
 #include <drivers/measured_boot/event_log/event_log.h>
 
 #include <plat/arm/common/plat_arm.h>
+#include <plat/common/platform.h>
 
 /* FVP table with platform specific image IDs, names and PCRs */
 static const image_data_t fvp_images_data[] = {
@@ -44,7 +45,16 @@
 
 void bl2_plat_mboot_init(void)
 {
+	uint8_t bl2_hash[TCG_DIGEST_SIZE];
+
 	event_log_init();
+
+	/* Get BL2 hash from DTB */
+	/* TODO: Avoid the extra copy of the hash buffer */
+	bl2_plat_get_hash(bl2_hash);
+
+	/* Add BL2 event */
+	event_log_record(bl2_hash, &fvp_images_data[0]);
 }
 
 void bl2_plat_mboot_finish(void)