From c04cb15cfa4544500a470deed47c19eb32c15b39 Mon Sep 17 00:00:00 2001 From: Sandrine Bailleux Date: Thu, 17 Jun 2021 17:18:39 +0200 Subject: [PATCH] refactor(measured boot): remove weak definition of plat_get_measured_boot_data() Weak definitions are confusing and should be avoided if possible. Thus, turn plat_get_measured_boot_data() into a strong definition that platforms must provide (if they need measured boot). We could have moved the old weak implementation under plat/common as a sane, default implementation that platforms may pull in if it suits them. However, this implementation right now simply measures BL2, which is not enough to get a complete measured boot flow, so this patch just removes it. This change only affects the Arm FVP platform, as no other upstream platform implements measured boot at the moment. Change-Id: If8680a39ae0ef1044ee981315439d5e0c8461229 Signed-off-by: Sandrine Bailleux --- drivers/measured_boot/event_log.c | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/drivers/measured_boot/event_log.c b/drivers/measured_boot/event_log.c index 727bdf5f3..0ea83971a 100644 --- a/drivers/measured_boot/event_log.c +++ b/drivers/measured_boot/event_log.c @@ -80,30 +80,6 @@ static const event2_header_t locality_event_header = { } }; -/* Platform's table with platform specific image IDs, names and PCRs */ -static const image_data_t plat_images_data[] = { - { BL2_IMAGE_ID, BL2_STRING, PCR_0 }, /* Reserved for BL2 */ - { INVALID_ID, NULL, (unsigned int)(-1) } /* Terminator */ -}; - -static const measured_boot_data_t plat_measured_boot_data = { - plat_images_data, - NULL, /* platform_set_nt_fw_info */ - NULL /* platform_set_tos_fw_info */ -}; - -/* - * Function retuns pointer to platform's measured_boot_data_t structure - * - * Must be overridden in the platform code - */ -#pragma weak plat_get_measured_boot_data - -const measured_boot_data_t *plat_get_measured_boot_data(void) -{ - return &plat_measured_boot_data; -} - /* * Add TCG_PCR_EVENT2 event *