Kyösti Mälkki has uploaded this change for review.
[WIP] security/vboot: Fix regression with VBOOT_STARTS_IN_ROMSTAGE
Fix regression after commit
21160a7 Add definition for ENV_ROMSTAGE_OR_BEFORE to <rules.h>
Builds with VBOOT_STARTS_IN_ROMSTAGE=y would evaluate
ENV_ROMSTAGE_OR_BEFORE incorrectly for verstage-class.
Follow-up changes for CBMEM console and timestamps, where
defined(__PRE_RAM__) tests are replaced, are likely to have
caused regressions such that VBOOT console and timestamps
are missing.
Change-Id: Idc274409c495efea95eeecd0538b2f8b847970ad
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
---
M src/include/rules.h
1 file changed, 2 insertions(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/08/35408/1
diff --git a/src/include/rules.h b/src/include/rules.h
index dc4210a..a9569c1 100644
--- a/src/include/rules.h
+++ b/src/include/rules.h
@@ -267,7 +267,8 @@
#endif
#define ENV_ROMSTAGE_OR_BEFORE \
- (ENV_DECOMPRESSOR || ENV_BOOTBLOCK || ENV_VERSTAGE || ENV_ROMSTAGE)
+ (ENV_DECOMPRESSOR || ENV_BOOTBLOCK || ENV_ROMSTAGE || \
+ (ENV_VERSTAGE && !CONFIG(VBOOT_STARTS_IN_ROMSTAGE)))
#if CONFIG(ARCH_X86)
/* Indicates memory layout is determined with arch/x86/car.ld. */
To view, visit change 35408. To unsubscribe, or for help writing mail filters, visit settings.