summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2019-09-12 17:09:55 +0300
committerKyösti Mälkki <kyosti.malkki@gmail.com>2019-09-13 19:29:18 +0000
commitb590a04f78ca69e45b075afa01f054a42e255ef6 (patch)
tree2c5446a5fe31317dfd4422257634e18aef9de2de
parent55d0ab5dc47cf319a71e1490ec93d88b2fb5cc2f (diff)
security/vboot: Replace use of __PRE_RAM__
Change-Id: Ibaeda2762c733fdbe48979b635cc0cfd7ee4295d Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/35387 Reviewed-by: Furquan Shaikh <furquan@google.com> Reviewed-by: Aaron Durbin <adurbin@chromium.org> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
-rw-r--r--src/security/vboot/misc.h6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/security/vboot/misc.h b/src/security/vboot/misc.h
index 725f5fd436..1458354ffc 100644
--- a/src/security/vboot/misc.h
+++ b/src/security/vboot/misc.h
@@ -117,11 +117,7 @@ static inline int vboot_logic_executed(void)
return !ENV_BOOTBLOCK;
} else if (CONFIG(VBOOT_STARTS_IN_ROMSTAGE)) {
/* Post-RAM stages are "after the romstage" */
-#ifdef __PRE_RAM__
- return 0;
-#else
- return 1;
-#endif
+ return !ENV_ROMSTAGE_OR_BEFORE;
} else {
dead_code();
}