commit b9c2ecffda4dec8e3c94002aeb12a253b29d1d77
author Martin Roth <martin@coreboot.org> Wed Jun 10 20:35:35 2020 -0600
committer Martin Roth <martinroth@google.com> Mon Jun 15 22:03:11 2020 +0000
tree e0c8a27f7e0bb48793f58c28e976f383cf67e620
parent 8a3a3c820b8f8a8d357bf54fb7532ad1ae1ba270

include/rules.h: Add vboot_before_bootblock to ENV_ROMSTAGE_OR_BEFORE

BUG=b:158124527
TEST=Build & boot Trembyle with PSP verstage

Change-Id: I3f5cc4d396c678f1020409cbdcb5127b2e0e6d89
Signed-off-by: Martin Roth <martin@coreboot.org>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/42379
Reviewed-by: Raul Rangel <rrangel@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>

src/include/rules.h

diff --git a/src/include/rules.h b/src/include/rules.h
index 614f37a..1ab603b 100644
--- a/src/include/rules.h
+++ b/src/include/rules.h
@@ -245,7 +245,7 @@
 
 #define ENV_ROMSTAGE_OR_BEFORE \
 	(ENV_DECOMPRESSOR || ENV_BOOTBLOCK || ENV_ROMSTAGE || \
-	(ENV_SEPARATE_VERSTAGE && CONFIG(VBOOT_STARTS_IN_BOOTBLOCK)))
+	(ENV_SEPARATE_VERSTAGE && !CONFIG(VBOOT_STARTS_IN_ROMSTAGE)))
 
 #if CONFIG(ARCH_X86)
 /* Indicates memory layout is determined with arch/x86/car.ld. */