[coreboot-gerrit] Change in ...coreboot[master]: vboot: fix STARTS_IN_BOOTBLOCK/_ROMSTAGE logic

[Joel Kitching (Code Review)]

Joel Kitching has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/31541

Change subject: vboot: fix STARTS_IN_BOOTBLOCK/_ROMSTAGE logic
......................................................................

vboot: fix STARTS_IN_BOOTBLOCK/_ROMSTAGE logic

Fix up the logic of when to include VBOOT2_WORK symbols on x86,
which are only needed when VBOOT_STARTS_IN_BOOTBLOCK is enabled.

Also correct the value of the __PRE_RAM__ macro in the case that
VBOOT_STARTS_IN_ROMSTAGE is selected.  In this case, DRAM is
already up and verstage should not be considered pre-ram.

BUG=b:124141368, b:124192753
TEST=Build locally for eve
TEST=util/lint/checkpatch.pl -g origin/master..HEAD
TEST=util/abuild/abuild -B -e -y -c 50 -p none -x
TEST=make clean && make test-abuild
BRANCH=none

Change-Id: Ie51e8f93b99ab230f3caeede2a33ec8b443e3d7a
Signed-off-by: Joel Kitching 
---
M src/arch/x86/car.ld
M src/security/vboot/Makefile.inc
2 files changed, 10 insertions(+), 4 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/41/31541/1

diff --git a/src/arch/x86/car.ld b/src/arch/x86/car.ld
index 6fe8f14..2d835a3 100644
--- a/src/arch/x86/car.ld
+++ b/src/arch/x86/car.ld
@@ -26,9 +26,9 @@
    .  += 4096 * CONFIG_NUM_CAR_PAGE_TABLE_PAGES;
    _epagetables = . ;
 #endif
-	/* Vboot work buffer is completely volatile outside of verstage and
-	 * romstage. Appropriate code needs to handle the transition. */
-#if IS_ENABLED(CONFIG_VBOOT_SEPARATE_VERSTAGE)
+	/* Vboot work buffer only needs to be available when verified boot
+	 * starts in bootblock. */
+#if IS_ENABLED(CONFIG_VBOOT_STARTS_IN_BOOTBLOCK)
    VBOOT2_WORK(., 16K)
 #endif
    /* Stack for CAR stages. Since it persists across all stages that
diff --git a/src/security/vboot/Makefile.inc b/src/security/vboot/Makefile.inc
index 6c63f7b..0c32d94 100644
--- a/src/security/vboot/Makefile.inc
+++ b/src/security/vboot/Makefile.inc
@@ -22,7 +22,13 @@
 verstage-y += bootmode.c
 postcar-y += bootmode.c

-verstage-generic-ccopts += -D__PRE_RAM__ -D__VERSTAGE__
+# When VBOOT_STARTS_IN_ROMSTAGE is selected, DRAM is already up by
+# the time verstage runs.
+ifneq ($(CONFIG_VBOOT_STARTS_IN_ROMSTAGE),y)
+verstage-generic-ccopts += -D__PRE_RAM__
+endif
+
+verstage-generic-ccopts += -D__VERSTAGE__

ramstage-y += gbb.c