summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2019-11-05 17:57:41 +0200
committerPatrick Georgi <pgeorgi@google.com>2019-11-08 07:44:12 +0000
commitc7fa911279a7ec6115e918ec0b630817cab932ae (patch)
treedb752f5fdf759215bf02cc2c115ad98c019b2140 /src
parentbf43f9ef13e972cb3ec7363fa6b89a96c0b7a0a0 (diff)
downloadcoreboot-c7fa911279a7ec6115e918ec0b630817cab932ae.tar.xz
eltan/security: Replace __PRE_RAM__ with ENV_ROMSTAGE_OR_BEFORE
Change-Id: Id56a63a67b7eb70dce6687bb9c2734a711f611b3 Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/36635 Reviewed-by: Wim Vervoorn <wvervoorn@eltan.com> Reviewed-by: Frans Hendriks <fhendriks@eltan.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src')
-rw-r--r--src/vendorcode/eltan/security/verified_boot/vboot_check.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/vendorcode/eltan/security/verified_boot/vboot_check.c b/src/vendorcode/eltan/security/verified_boot/vboot_check.c
index f77636b313..1dc1c3a37f 100644
--- a/src/vendorcode/eltan/security/verified_boot/vboot_check.c
+++ b/src/vendorcode/eltan/security/verified_boot/vboot_check.c
@@ -222,16 +222,14 @@ void verified_boot_check_cbfsfile(const char *name, uint32_t type, uint32_t hash
start = cbfs_boot_map_with_leak(name, type & ~VERIFIED_BOOT_COPY_BLOCK, &size);
if (start && size) {
/* Speed up processing by copying the file content to memory first */
-#ifndef __PRE_RAM__
- if ((type & VERIFIED_BOOT_COPY_BLOCK) && (buffer) && (*buffer) &&
- ((uint32_t) start > (uint32_t)(~(CONFIG_CBFS_SIZE-1)))) {
+ if (!ENV_ROMSTAGE_OR_BEFORE && (type & VERIFIED_BOOT_COPY_BLOCK) && (buffer) &&
+ (*buffer) && ((uint32_t) start > (uint32_t)(~(CONFIG_CBFS_SIZE-1)))) {
printk(BIOS_DEBUG, "%s: move buffer to memory\n", __func__);
/* Move the file to a memory bufferof which we know it doesn't harm */
memcpy(*buffer, start, size);
start = *buffer;
printk(BIOS_DEBUG, "%s: done\n", __func__);
}
-#endif // __PRE_RAM__
verified_boot_check_buffer(name, start, size, hash_index, pcr);
} else {
printk(BIOS_EMERG, "CBFS Failed to get file content for %s\n", name);