summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2019-09-14 14:59:38 +0300
committerPatrick Georgi <pgeorgi@google.com>2019-09-17 08:17:23 +0000
commitf704b548834fa7d2e7e9069750fd96b75df3e547 (patch)
treedfdd5c09012f96a3c3013d857308198182c09f80 /src
parentbfb5c807e720761f4457d5106bb919f2aacb5535 (diff)
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> Reviewed-on: https://review.coreboot.org/c/coreboot/+/35408 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Aaron Durbin <adurbin@chromium.org> Reviewed-by: Furquan Shaikh <furquan@google.com>
Diffstat (limited to 'src')
-rw-r--r--src/include/rules.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/include/rules.h b/src/include/rules.h
index dc4210a06f..0436198363 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_BOOTBLOCK)))
#if CONFIG(ARCH_X86)
/* Indicates memory layout is determined with arch/x86/car.ld. */