From bf43f9ef13e972cb3ec7363fa6b89a96c0b7a0a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= Date: Tue, 5 Nov 2019 17:55:15 +0200 Subject: eltan/security: Replace __BOOTBLOCK__ with ENV_BOOTBLOCK MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I6ec5a33cd6a6342adfe73c050e0c376bbefad96a Signed-off-by: Kyösti Mälkki Reviewed-on: https://review.coreboot.org/c/coreboot/+/36634 Tested-by: build bot (Jenkins) Reviewed-by: Wim Vervoorn Reviewed-by: Frans Hendriks --- src/vendorcode/eltan/security/verified_boot/vboot_check.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'src/vendorcode/eltan/security/verified_boot') 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); } -- cgit v1.2.3