summaryrefslogtreecommitdiff
path: root/src/security/intel
diff options
context:
space:
mode:
Diffstat (limited to 'src/security/intel')
-rw-r--r--src/security/intel/stm/StmPlatformSmm.c3
-rw-r--r--src/security/intel/txt/ramstage.c11
2 files changed, 5 insertions, 9 deletions
diff --git a/src/security/intel/stm/StmPlatformSmm.c b/src/security/intel/stm/StmPlatformSmm.c
index eb9a0bb22f..abd7667355 100644
--- a/src/security/intel/stm/StmPlatformSmm.c
+++ b/src/security/intel/stm/StmPlatformSmm.c
@@ -35,8 +35,7 @@ int load_stm_image(uintptr_t mseg)
memset((void *)mseg_base, 0, CONFIG_MSEG_SIZE); // clear the mseg
- stm_image_size = cbfs_boot_load_file("stm.bin", mseg_base,
- stm_buffer_size, CBFS_TYPE_RAW);
+ stm_image_size = cbfs_load("stm.bin", mseg_base, stm_buffer_size);
printk(BIOS_DEBUG, "STM:loaded into mseg: 0x%p size: %u\n", mseg_base,
stm_image_size);
/* status is number of bytes loaded */
diff --git a/src/security/intel/txt/ramstage.c b/src/security/intel/txt/ramstage.c
index 76eeaaffef..81d2dd1083 100644
--- a/src/security/intel/txt/ramstage.c
+++ b/src/security/intel/txt/ramstage.c
@@ -221,10 +221,9 @@ static void txt_initialize_heap(void)
data.bdr.no_logical_procs = dev_count_cpu();
void *sinit_base = (void *)(uintptr_t)read64((void *)TXT_SINIT_BASE);
- data.bdr.bios_sinit_size = cbfs_boot_load_file(CONFIG_INTEL_TXT_CBFS_SINIT_ACM,
- sinit_base,
- read64((void *)TXT_SINIT_SIZE),
- CBFS_TYPE_RAW);
+ data.bdr.bios_sinit_size = cbfs_load(CONFIG_INTEL_TXT_CBFS_SINIT_ACM,
+ sinit_base,
+ read64((void *)TXT_SINIT_SIZE));
if (data.bdr.bios_sinit_size) {
printk(BIOS_INFO, "TEE-TXT: Placing SINIT ACM in memory.\n");
@@ -277,9 +276,7 @@ static void txt_initialize_heap(void)
data.heap_acm.num_acms = 1;
}
data.heap_acm.acm_addrs[0] =
- (uintptr_t)cbfs_boot_map_with_leak(CONFIG_INTEL_TXT_CBFS_BIOS_ACM,
- CBFS_TYPE_RAW,
- NULL);
+ (uintptr_t)cbfs_map(CONFIG_INTEL_TXT_CBFS_BIOS_ACM, NULL);
/* Extended elements - End marker */
data.end.type = HEAP_EXTDATA_TYPE_END;
data.end.size = sizeof(data.end);