summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMartin Roth <martinroth@chromium.org>2020-07-15 13:57:54 -0600
committerAaron Durbin <adurbin@chromium.org>2020-08-21 18:48:06 +0000
commit1594e8ff9c94f49605d356d8761dd818c3bc2905 (patch)
tree478050bac54ab3277a79fa24857559fcdc0c6d86 /src
parente2d0ba0acbc6b2b6c4d9f350f8e67b2287054f79 (diff)
downloadcoreboot-1594e8ff9c94f49605d356d8761dd818c3bc2905.tar.xz
lib: Update 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 create a new ENV value for ENV_INITIAL_STAGE. BUG=None TEST=Boot, see that error message is gone from psp_verstage Signed-off-by: Martin Roth <martinroth@chromium.org> Change-Id: I142f2092ade7b4327780d423d121728bfbdab247 Reviewed-on: https://review.coreboot.org/c/coreboot/+/43488 Reviewed-by: Julius Werner <jwerner@chromium.org> Reviewed-by: Raul Rangel <rrangel@chromium.org> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src')
-rw-r--r--src/include/rules.h7
-rw-r--r--src/lib/fmap.c5
2 files changed, 9 insertions, 3 deletions
diff --git a/src/include/rules.h b/src/include/rules.h
index be72e9ea06..39836b11bf 100644
--- a/src/include/rules.h
+++ b/src/include/rules.h
@@ -274,6 +274,13 @@
#define ENV_USER_SPACE 0
#endif
+/* Define the first stage to run */
+#if CONFIG(VBOOT_STARTS_BEFORE_BOOTBLOCK)
+#define ENV_INITIAL_STAGE ENV_SEPARATE_VERSTAGE
+#else
+#define ENV_INITIAL_STAGE ENV_BOOTBLOCK
+#endif
+
/**
* For pre-DRAM stages and post-CAR always build with simple device model, ie.
* PCI, PNP and CPU functions operate without use of devicetree. The reason
diff --git a/src/lib/fmap.c b/src/lib/fmap.c
index 671a962c25..e1e6a57a22 100644
--- a/src/lib/fmap.c
+++ b/src/lib/fmap.c
@@ -56,9 +56,8 @@ static void setup_preram_cache(struct mem_region_device *cache_mrdev)
}
struct fmap *fmap = (struct fmap *)_fmap_cache;
- if (!ENV_BOOTBLOCK) {
- /* NOTE: This assumes that for all platforms running this code,
- the bootblock is the first stage and the bootblock will make
+ if (!(ENV_INITIAL_STAGE)) {
+ /* NOTE: This assumes that the first stage will make
at least one FMAP access (usually from finding CBFS). */
if (!check_signature(fmap))
goto register_cache;