[coreboot-gerrit] Change in coreboot[master]: cbfs: Do not use vboot_locator in bootblock with separate verstage

[Hung-Te Lin (Code Review)]

Hung-Te Lin has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/37838 )

Change subject: cbfs: Do not use vboot_locator in bootblock with separate verstage
......................................................................

cbfs: Do not use vboot_locator in bootblock with separate verstage

When separate verstage is available, all the vboot logic is done in
verstage and bootblock should load verstage directly. This helps
minimizing bootblock size on devices with limited storage.

For example, on Kodama, the bootblock is reduced from 21504 to
20480 bytes (-4%), where the system can only allow 20992 bytes.

BUG=b:146542160
TEST=emerge-kukui coreboot chromeos-ec chromeos-bootimage

Change-Id: Id17cd151b4426231704b1c9845348763126a7870
Signed-off-by: Hung-Te Lin 
---
M src/lib/cbfs.c
1 file changed, 3 insertions(+), 1 deletion(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/38/37838/1

diff --git a/src/lib/cbfs.c b/src/lib/cbfs.c
index 636ff70..e3c4692 100644
--- a/src/lib/cbfs.c
+++ b/src/lib/cbfs.c
@@ -302,11 +302,13 @@
 extern const struct cbfs_locator vboot_locator;

static const struct cbfs_locator *locators[] = {
-#if CONFIG(VBOOT)
+#if CONFIG(VBOOT) && !(ENV_BOOTBLOCK && CONFIG(VBOOT_SEPARATE_VERSTAGE))
    /*
     * NOTE: Does not link in SMM, as the vboot_locator isn't compiled.
     * ATM there's no need for VBOOT functionality in SMM and it's not
     * a problem.
+	 * Also don't use vboot_locator in bootblock when separate verstage is
+	 * available, to help reducing bootblock size.
     */
    &vboot_locator,
 #endif