summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2019-11-05 17:55:15 +0200
committerPatrick Georgi <pgeorgi@google.com>2019-11-08 07:43:43 +0000
commitbf43f9ef13e972cb3ec7363fa6b89a96c0b7a0a0 (patch)
tree78fb5b9741a9a6c659ce9a033f149bf7efbcf042
parented8eaab08a79f6a20b2bcffd5a1073e56812ac2b (diff)
downloadcoreboot-bf43f9ef13e972cb3ec7363fa6b89a96c0b7a0a0.tar.xz
eltan/security: Replace __BOOTBLOCK__ with ENV_BOOTBLOCK
Change-Id: I6ec5a33cd6a6342adfe73c050e0c376bbefad96a Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/36634 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Wim Vervoorn <wvervoorn@eltan.com> Reviewed-by: Frans Hendriks <fhendriks@eltan.com>
-rw-r--r--src/vendorcode/eltan/security/verified_boot/vboot_check.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/vendorcode/eltan/security/verified_boot/vboot_check.c b/src/vendorcode/eltan/security/verified_boot/vboot_check.c
index fdae7b8b46..f77636b313 100644
--- a/src/vendorcode/eltan/security/verified_boot/vboot_check.c
+++ b/src/vendorcode/eltan/security/verified_boot/vboot_check.c
@@ -131,8 +131,6 @@ static int vendor_secure_locate(struct cbfs_props *props)
return 0;
}
-#ifndef __BOOTBLOCK__
-
/*
*
* measure_item
@@ -168,7 +166,6 @@ static int measure_item(uint32_t pcr, uint8_t *hashData, uint32_t hashDataLen,
}
return status;
}
-#endif
static void verified_boot_check_buffer(const char *name, void *start, size_t size,
uint32_t hash_index, int32_t pcr)
@@ -198,8 +195,7 @@ static void verified_boot_check_buffer(const char *name, void *start, size_t siz
printk(BIOS_EMERG, "%s ", name);
die("HASH verification failed!\n");
} else {
-#ifndef __BOOTBLOCK__
- if (CONFIG(VENDORCODE_ELTAN_MBOOT)) {
+ if (!ENV_BOOTBLOCK && CONFIG(VENDORCODE_ELTAN_MBOOT)) {
if (pcr != -1) {
printk(BIOS_DEBUG, "%s: measuring %s\n", __func__, name);
if (measure_item(pcr, digest, sizeof(digest),
@@ -208,7 +204,6 @@ static void verified_boot_check_buffer(const char *name, void *start, size_t siz
__func__);
}
}
-#endif
if (CONFIG(VENDORCODE_ELTAN_VBOOT))
printk(BIOS_DEBUG, "%s HASH verification success\n", name);
}