Martin Roth has uploaded this change for review.

View Change

lib: Remove corrupted fmap cache error for psp_verstage

The assumption was that the fmap cache would be initialized in
bootblock, otherwise an error is shown. This error is showing
up in psp_verstage when the fmap cache is initialized there, so
add an exception.

BUG=None
TEST=Boot, see that error message is gone from psp_verstage

Signed-off-by: Martin Roth <martinroth@chromium.org>
Change-Id: I142f2092ade7b4327780d423d121728bfbdab247
---
M src/lib/fmap.c
1 file changed, 2 insertions(+), 1 deletion(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/88/43488/1
diff --git a/src/lib/fmap.c b/src/lib/fmap.c
index 671a962..3c06b1a 100644
--- a/src/lib/fmap.c
+++ b/src/lib/fmap.c
@@ -56,7 +56,8 @@
}

struct fmap *fmap = (struct fmap *)_fmap_cache;
- if (!ENV_BOOTBLOCK) {
+ if (!(ENV_BOOTBLOCK ||
+ (ENV_SEPARATE_VERSTAGE && CONFIG(VBOOT_STARTS_BEFORE_BOOTBLOCK)))) {
/* NOTE: This assumes that for all platforms running this code,
the bootblock is the first stage and the bootblock will make
at least one FMAP access (usually from finding CBFS). */

To view, visit change 43488. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I142f2092ade7b4327780d423d121728bfbdab247
Gerrit-Change-Number: 43488
Gerrit-PatchSet: 1
Gerrit-Owner: Martin Roth <martinroth@google.com>
Gerrit-MessageType: newchange