diff --git a/plat/rpi/common/rpi3_common.c b/plat/rpi/common/rpi3_common.c index 4e3c9f233..490835402 100644 --- a/plat/rpi/common/rpi3_common.c +++ b/plat/rpi/common/rpi3_common.c @@ -75,6 +75,9 @@ static const mmap_region_t plat_rpi3_mmap[] = { #endif MAP_DEVICE0, MAP_FIP, +#if MEASURED_BOOT + RPI3_MAP_BL1_RW, +#endif MAP_NS_DRAM0, #ifdef BL32_BASE MAP_BL32_MEM, diff --git a/plat/rpi/rpi3/include/platform_def.h b/plat/rpi/rpi3/include/platform_def.h index 37aceafc7..eb2914ab4 100644 --- a/plat/rpi/rpi3/include/platform_def.h +++ b/plat/rpi/rpi3/include/platform_def.h @@ -171,6 +171,14 @@ #define BL1_RW_BASE (BL1_RW_LIMIT - PLAT_MAX_BL1_RW_SIZE) #define BL1_RW_LIMIT (BL_RAM_BASE + BL_RAM_SIZE) +/* + * In order to access the TCG Event Log in BL2, we need to expose the BL1_RW region + * where the log resides. + */ +#define RPI3_MAP_BL1_RW MAP_REGION_FLAT(BL1_RW_BASE, \ + BL1_RW_LIMIT - BL1_RW_BASE, \ + MT_MEMORY | MT_RW | MT_SECURE) + /* * BL2 specific defines. *