Change in coreboot[master]: eltan/security: Replace __BOOTBLOCK__ with ENV_BOOTBLOCK

[Kyösti Mälkki (Code Review)]

Kyösti Mälkki has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/36634 )

Change subject: eltan/security: Replace __BOOTBLOCK__ with ENV_BOOTBLOCK
......................................................................

eltan/security: Replace __BOOTBLOCK__ with ENV_BOOTBLOCK

Change-Id: I6ec5a33cd6a6342adfe73c050e0c376bbefad96a
Signed-off-by: Kyösti Mälkki 
---
M src/vendorcode/eltan/security/verified_boot/vboot_check.c
1 file changed, 1 insertion(+), 6 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/34/36634/1

diff --git a/src/vendorcode/eltan/security/verified_boot/vboot_check.c b/src/vendorcode/eltan/security/verified_boot/vboot_check.c
index 0e96f52..d08fa44 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 @@
    return 0;
 }

-#ifndef __BOOTBLOCK__
-
 /*
  *
  * measure_item
@@ -168,7 +166,6 @@
    }
    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 @@
    		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 @@
    					       __func__);
    			}
    		}
-#endif
    		if (CONFIG(VENDORCODE_ELTAN_VBOOT))
    			printk(BIOS_DEBUG, "%s HASH verification success\n", name);
    	}

[Wim Vervoorn (Code Review)]

Wim Vervoorn has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/36634 )

Change subject: eltan/security: Replace __BOOTBLOCK__ with ENV_BOOTBLOCK
......................................................................

Patch Set 2: Code-Review+1

[Frans Hendriks (Code Review)]

Frans Hendriks has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/36634 )

Change subject: eltan/security: Replace __BOOTBLOCK__ with ENV_BOOTBLOCK
......................................................................

Patch Set 2: Code-Review+2

[Patrick Georgi (Code Review)]

Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/36634 )

Change subject: eltan/security: Replace __BOOTBLOCK__ with ENV_BOOTBLOCK
......................................................................

eltan/security: Replace __BOOTBLOCK__ with ENV_BOOTBLOCK

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 
---
M src/vendorcode/eltan/security/verified_boot/vboot_check.c
1 file changed, 1 insertion(+), 6 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Wim Vervoorn: Looks good to me, but someone else must approve
  Frans Hendriks: Looks good to me, approved

diff --git a/src/vendorcode/eltan/security/verified_boot/vboot_check.c b/src/vendorcode/eltan/security/verified_boot/vboot_check.c
index fdae7b8..f77636b 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 @@
    return 0;
 }

-#ifndef __BOOTBLOCK__
-
 /*
  *
  * measure_item
@@ -168,7 +166,6 @@
    }
    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 @@
    		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 @@
    					       __func__);
    			}
    		}
-#endif
    		if (CONFIG(VENDORCODE_ELTAN_VBOOT))
    			printk(BIOS_DEBUG, "%s HASH verification success\n", name);
    	}