From b590a04f78ca69e45b075afa01f054a42e255ef6 Mon Sep 17 00:00:00 2001
From: Kyösti Mälkki <kyosti.malkki@gmail.com>
Date: Thu, 12 Sep 2019 17:09:55 +0300
Subject: security/vboot: Replace use of __PRE_RAM__
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 src/security/vboot/misc.h | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'src')

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();
 	}
-- 
cgit v1.2.3