[coreboot-gerrit] Change in coreboot[master]: lib/cbfs: Disable cbfs_preload in romstage when VBOOT_STARTS_IN_ROMSTAGE

[Raul Rangel (Code Review)]

Raul Rangel has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/59876 )

Change subject: lib/cbfs: Disable cbfs_preload in romstage when VBOOT_STARTS_IN_ROMSTAGE
......................................................................

lib/cbfs: Disable cbfs_preload in romstage when VBOOT_STARTS_IN_ROMSTAGE

Preloading files before vboot runs and using them after vboot has
finished will result in the wrong files getting used. Disable
cbfs_preload to avoid this behavior.

BUG=b:179699789
TEST=none

Signed-off-by: Raul E Rangel 
Change-Id: I7698b481a73fb24eecf4c810ff8be8b6826528ca
---
M src/lib/cbfs.c
1 file changed, 4 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/76/59876/1

diff --git a/src/lib/cbfs.c b/src/lib/cbfs.c
index d1930a9..2f889d9 100644
--- a/src/lib/cbfs.c
+++ b/src/lib/cbfs.c
@@ -328,6 +328,10 @@
    if (!CONFIG(CBFS_PRELOAD))
    	dead_code();

+	/* We don't want to cross the vboot boundary */
+	if (ENV_ROMSTAGE && CONFIG(VBOOT_STARTS_IN_ROMSTAGE))
+		return;
+
    DEBUG("%s(name='%s')\n", __func__, name);

if (_cbfs_boot_lookup(name, force_ro, &mdata, &rdev))