mirrors/arm-trusted-firmware
0
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2024-11-30 13:25:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor(fvp): align image identifier string macros

Browse Source 
Macros were renamed, align with new names.

Signed-off-by: Tamas Ban <tamas.ban@arm.com>
Change-Id: I85d03164f580d9c41b7955482914d20188e559e5
This commit is contained in:
Tamas Ban 2023-06-05 11:11:28 +02:00
parent c6b204cca5
commit 09bb42dbd4
2 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
plat/arm/board/fvp/fvp_bl1_measured_boot.c
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2021-2023, Arm Limited. All rights reserved.
* Copyright (c) 2021-2024, Arm Limited. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
@ -7,6 +7,7 @@
#include <stdint.h>
#include <drivers/measured_boot/event_log/event_log.h>
#include <drivers/measured_boot/metadata.h>
#include <plat/arm/common/plat_arm.h>
#include <tools_share/zero_oid.h>
@ -15,9 +16,9 @@ static uint8_t event_log[PLAT_ARM_EVENT_LOG_MAX_SIZE];
/* FVP table with platform specific image IDs, names and PCRs */
const event_log_metadata_t fvp_event_log_metadata[] = {
{ FW_CONFIG_ID, EVLOG_FW_CONFIG_STRING, PCR_0 },
{ TB_FW_CONFIG_ID, EVLOG_TB_FW_CONFIG_STRING, PCR_0 },
{ BL2_IMAGE_ID, EVLOG_BL2_STRING, PCR_0 },
{ FW_CONFIG_ID, MBOOT_FW_CONFIG_STRING, PCR_0 },
{ TB_FW_CONFIG_ID, MBOOT_TB_FW_CONFIG_STRING, PCR_0 },
{ BL2_IMAGE_ID, MBOOT_BL2_IMAGE_STRING, PCR_0 },
{ EVLOG_INVALID_ID, NULL, (unsigned int)(-1) } /* Terminator */
};

41
plat/arm/board/fvp/fvp_bl2_measured_boot.c
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2021-2023, Arm Limited. All rights reserved.
* Copyright (c) 2021-2024, Arm Limited. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
@ -8,6 +8,7 @@
#include <common/tbbr/tbbr_img_def.h>
#include <drivers/measured_boot/event_log/event_log.h>
#include <drivers/measured_boot/metadata.h>
#if defined(ARM_COT_cca)
#include <tools_share/cca_oid.h>
#else
@ -28,27 +29,27 @@ static uint64_t event_log_base;
/* FVP table with platform specific image IDs, names and PCRs */
const event_log_metadata_t fvp_event_log_metadata[] = {
{ BL31_IMAGE_ID, EVLOG_BL31_STRING, PCR_0 },
{ BL32_IMAGE_ID, EVLOG_BL32_STRING, PCR_0 },
{ BL32_EXTRA1_IMAGE_ID, EVLOG_BL32_EXTRA1_STRING, PCR_0 },
{ BL32_EXTRA2_IMAGE_ID, EVLOG_BL32_EXTRA2_STRING, PCR_0 },
{ BL33_IMAGE_ID, EVLOG_BL33_STRING, PCR_0 },
{ HW_CONFIG_ID, EVLOG_HW_CONFIG_STRING, PCR_0 },
{ NT_FW_CONFIG_ID, EVLOG_NT_FW_CONFIG_STRING, PCR_0 },
{ SCP_BL2_IMAGE_ID, EVLOG_SCP_BL2_STRING, PCR_0 },
{ SOC_FW_CONFIG_ID, EVLOG_SOC_FW_CONFIG_STRING, PCR_0 },
{ TOS_FW_CONFIG_ID, EVLOG_TOS_FW_CONFIG_STRING, PCR_0 },
{ RMM_IMAGE_ID, EVLOG_RMM_STRING, PCR_0},
{ BL31_IMAGE_ID, MBOOT_BL31_IMAGE_STRING, PCR_0 },
{ BL32_IMAGE_ID, MBOOT_BL32_IMAGE_STRING, PCR_0 },
{ BL32_EXTRA1_IMAGE_ID, MBOOT_BL32_EXTRA1_IMAGE_STRING, PCR_0 },
{ BL32_EXTRA2_IMAGE_ID, MBOOT_BL32_EXTRA2_IMAGE_STRING, PCR_0 },
{ BL33_IMAGE_ID, MBOOT_BL33_IMAGE_STRING, PCR_0 },
{ HW_CONFIG_ID, MBOOT_HW_CONFIG_STRING, PCR_0 },
{ NT_FW_CONFIG_ID, MBOOT_NT_FW_CONFIG_STRING, PCR_0 },
{ SCP_BL2_IMAGE_ID, MBOOT_SCP_BL2_IMAGE_STRING, PCR_0 },
{ SOC_FW_CONFIG_ID, MBOOT_SOC_FW_CONFIG_STRING, PCR_0 },
{ TOS_FW_CONFIG_ID, MBOOT_TOS_FW_CONFIG_STRING, PCR_0 },
{ RMM_IMAGE_ID, MBOOT_RMM_IMAGE_STRING, PCR_0},
#if defined(SPD_spmd)
{ SP_PKG1_ID, EVLOG_SP1_STRING, PCR_0 },
{ SP_PKG2_ID, EVLOG_SP2_STRING, PCR_0 },
{ SP_PKG3_ID, EVLOG_SP3_STRING, PCR_0 },
{ SP_PKG4_ID, EVLOG_SP4_STRING, PCR_0 },
{ SP_PKG5_ID, EVLOG_SP5_STRING, PCR_0 },
{ SP_PKG6_ID, EVLOG_SP6_STRING, PCR_0 },
{ SP_PKG7_ID, EVLOG_SP7_STRING, PCR_0 },
{ SP_PKG8_ID, EVLOG_SP8_STRING, PCR_0 },
{ SP_PKG1_ID, MBOOT_SP1_STRING, PCR_0 },
{ SP_PKG2_ID, MBOOT_SP2_STRING, PCR_0 },
{ SP_PKG3_ID, MBOOT_SP3_STRING, PCR_0 },
{ SP_PKG4_ID, MBOOT_SP4_STRING, PCR_0 },
{ SP_PKG5_ID, MBOOT_SP5_STRING, PCR_0 },
{ SP_PKG6_ID, MBOOT_SP6_STRING, PCR_0 },
{ SP_PKG7_ID, MBOOT_SP7_STRING, PCR_0 },
{ SP_PKG8_ID, MBOOT_SP8_STRING, PCR_0 },
#endif
{ CRITICAL_DATA_ID, EVLOG_CRITICAL_DATA_STRING, PCR_1 },