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>

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 !ENV_ROMSTAGE_OR_BEFORE;
-		return 0;
-#else
-		return 1;
-#endif
 	} else {
 		dead_code();
 	}