refactor(fvp): pass platform metadata as a function's argument

Based on the prototype modification of the event_log_measure_and_record
function in the previous patch, platform metadata was passed as an
argument.

Change-Id: Id1bf59c243c483d7e32152f094c693e95d29fe2b
Signed-off-by: Manish V Badarkhe <Manish.Badarkhe@arm.com>

diff --git a/plat/arm/board/fvp/fvp_bl2_measured_boot.c b/plat/arm/board/fvp/fvp_bl2_measured_boot.c
index e938e241927aac7ee52e5da10acfc4c506c4ea3b..29b66197d361774e2d70e26223c385accc99f069 100644 (file)
--- a/plat/arm/board/fvp/fvp_bl2_measured_boot.c
+++ b/plat/arm/board/fvp/fvp_bl2_measured_boot.c
@@ -125,7 +125,8 @@ int plat_mboot_measure_critical_data(unsigned int critical_data_id,
 
        /* Calculate image hash and record data in Event Log */
        int err = event_log_measure_and_record((uintptr_t)base, (uint32_t)size,
-                                              critical_data_id);
+                                              critical_data_id,
+                                              fvp_event_log_metadata);
        if (err != 0) {
                ERROR("%s%s critical data (%i)\n",
                      "Failed to ", "record",  err);

diff --git a/plat/arm/board/fvp/fvp_common_measured_boot.c b/plat/arm/board/fvp/fvp_common_measured_boot.c
index 93aa0558c5591fabb13513f33814c6ef0ae0c92b..b5b8f10eddbbe5d431865b11fc6b4cc8f4f9c299 100644 (file)
--- a/plat/arm/board/fvp/fvp_common_measured_boot.c
+++ b/plat/arm/board/fvp/fvp_common_measured_boot.c
@@ -16,11 +16,6 @@
 extern event_log_metadata_t fvp_event_log_metadata[];
 extern struct rss_mboot_metadata fvp_rss_mboot_metadata[];
 
-const event_log_metadata_t *plat_event_log_get_metadata(void)
-{
-       return fvp_event_log_metadata;
-}
-
 struct rss_mboot_metadata *plat_rss_mboot_get_metadata(void)
 {
        return fvp_rss_mboot_metadata;
@@ -34,7 +29,8 @@ int plat_mboot_measure_image(unsigned int image_id, image_info_t *image_data)
        /* Calculate image hash and record data in Event Log */
        err = event_log_measure_and_record(image_data->image_base,
                                           image_data->image_size,
-                                          image_id);
+                                          image_id,
+                                          fvp_event_log_metadata);
        if (err != 0) {
                ERROR("%s%s image id %u (%i)\n",
                      "Failed to ", "record in event log", image_id, err);