Djam/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-04-26 23:04:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge "feat(fvp): remove left-over RSS usage" into integration

Browse source
This commit is contained in:
Manish V Badarkhe 2024-02-09 16:21:49 +01:00 • committed by TrustedFirmware Code Review
commit 25f5574479
3 changed files with 0 additions and 90 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
plat/arm/board/fvp/fvp_bl1_measured_boot.c
View file

@ -7,7 +7,6 @@
#include <stdint.h> #include <stdint.h>
#include <drivers/measured_boot/event_log/event_log.h> #include <drivers/measured_boot/event_log/event_log.h>
#include <drivers/measured_boot/rss/rss_measured_boot.h>
#include <plat/arm/common/plat_arm.h> #include <plat/arm/common/plat_arm.h>
#include <tools_share/zero_oid.h> #include <tools_share/zero_oid.h>
@ -23,42 +22,10 @@ const event_log_metadata_t fvp_event_log_metadata[] = {
{ EVLOG_INVALID_ID, NULL, (unsigned int)(-1) } /* Terminator */ { EVLOG_INVALID_ID, NULL, (unsigned int)(-1) } /* Terminator */
}; };
/* FVP table with platform specific image IDs and metadata. Intentionally not a
* const struct, some members might set by bootloaders during trusted boot.
*/
struct rss_mboot_metadata fvp_rss_mboot_metadata[] = {
{
.id = FW_CONFIG_ID,
.slot = U(6),
.signer_id_size = SIGNER_ID_MIN_SIZE,
.sw_type = RSS_MBOOT_FW_CONFIG_STRING,
.pk_oid = ZERO_OID,
.lock_measurement = true },
{
.id = TB_FW_CONFIG_ID,
.slot = U(7),
.signer_id_size = SIGNER_ID_MIN_SIZE,
.sw_type = RSS_MBOOT_TB_FW_CONFIG_STRING,
.pk_oid = ZERO_OID,
.lock_measurement = true },
{
.id = BL2_IMAGE_ID,
.slot = U(8),
.signer_id_size = SIGNER_ID_MIN_SIZE,
.sw_type = RSS_MBOOT_BL2_STRING,
.pk_oid = ZERO_OID,
.lock_measurement = true },
{
.id = RSS_MBOOT_INVALID_ID }
};
void bl1_plat_mboot_init(void) void bl1_plat_mboot_init(void)
{ {
event_log_init(event_log, event_log + sizeof(event_log)); event_log_init(event_log, event_log + sizeof(event_log));
event_log_write_header(); event_log_write_header();
rss_measured_boot_init(fvp_rss_mboot_metadata);
} }
void bl1_plat_mboot_finish(void) void bl1_plat_mboot_finish(void)

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

@ -8,7 +8,6 @@
#include <common/tbbr/tbbr_img_def.h> #include <common/tbbr/tbbr_img_def.h>
#include <drivers/measured_boot/event_log/event_log.h> #include <drivers/measured_boot/event_log/event_log.h>
#include <drivers/measured_boot/rss/rss_measured_boot.h>
#if defined(ARM_COT_cca) #if defined(ARM_COT_cca)
#include <tools_share/cca_oid.h> #include <tools_share/cca_oid.h>
#else #else
@ -57,44 +56,6 @@ const event_log_metadata_t fvp_event_log_metadata[] = {
{ EVLOG_INVALID_ID, NULL, (unsigned int)(-1) } /* Terminator */ { EVLOG_INVALID_ID, NULL, (unsigned int)(-1) } /* Terminator */
}; };
/* FVP table with platform specific image IDs and metadata. Intentionally not a
* const struct, some members might set by bootloaders during trusted boot.
*/
struct rss_mboot_metadata fvp_rss_mboot_metadata[] = {
{
.id = BL31_IMAGE_ID,
.slot = U(9),
.signer_id_size = SIGNER_ID_MIN_SIZE,
.sw_type = RSS_MBOOT_BL31_STRING,
.pk_oid = BL31_IMAGE_KEY_OID,
.lock_measurement = true },
{
.id = HW_CONFIG_ID,
.slot = U(10),
.signer_id_size = SIGNER_ID_MIN_SIZE,
.sw_type = RSS_MBOOT_HW_CONFIG_STRING,
.pk_oid = HW_CONFIG_KEY_OID,
.lock_measurement = true },
{
.id = SOC_FW_CONFIG_ID,
.slot = U(11),
.signer_id_size = SIGNER_ID_MIN_SIZE,
.sw_type = RSS_MBOOT_SOC_FW_CONFIG_STRING,
.pk_oid = SOC_FW_CONFIG_KEY_OID,
.lock_measurement = true },
#if ENABLE_RME
{
.id = RMM_IMAGE_ID,
.slot = U(12),
.signer_id_size = SIGNER_ID_MIN_SIZE,
.sw_type = RSS_MBOOT_RMM_STRING,
.pk_oid = RMM_IMAGE_KEY_OID,
.lock_measurement = true },
#endif /* ENABLE_RME */
{
.id = RSS_MBOOT_INVALID_ID }
};
void bl2_plat_mboot_init(void) void bl2_plat_mboot_init(void)
{ {
uint8_t *event_log_start; uint8_t *event_log_start;
@ -126,8 +87,6 @@ void bl2_plat_mboot_init(void)
event_log_max_size); event_log_max_size);
event_log_init((uint8_t *)event_log_start, event_log_finish); event_log_init((uint8_t *)event_log_start, event_log_finish);
rss_measured_boot_init(fvp_rss_mboot_metadata);
} }
int plat_mboot_measure_critical_data(unsigned int critical_data_id, int plat_mboot_measure_critical_data(unsigned int critical_data_id,

16
plat/arm/board/fvp/platform.mk
View file

@ -443,22 +443,6 @@ ifneq (${RESET_TO_BL2}, 0)
override BL1_SOURCES = override BL1_SOURCES =
endif endif
# Include Measured Boot makefile before any Crypto library makefile.
# Crypto library makefile may need default definitions of Measured Boot build
# flags present in Measured Boot makefile.
ifeq (${MEASURED_BOOT},1)
RSS_MEASURED_BOOT_MK := drivers/measured_boot/rss/rss_measured_boot.mk
$(info Including ${RSS_MEASURED_BOOT_MK})
include ${RSS_MEASURED_BOOT_MK}
ifneq (${MBOOT_RSS_HASH_ALG}, sha256)
$(eval $(call add_define,TF_MBEDTLS_MBOOT_USE_SHA512))
endif
BL1_SOURCES += ${MEASURED_BOOT_SOURCES}
BL2_SOURCES += ${MEASURED_BOOT_SOURCES}
endif
include plat/arm/board/common/board_common.mk include plat/arm/board/common/board_common.mk
include plat/arm/common/arm_common.mk include plat/arm/common/arm_common.mk