summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArthur Heymans <arthur@aheymans.xyz>2019-10-25 16:53:29 +0200
committerPatrick Georgi <pgeorgi@google.com>2019-10-28 11:55:31 +0000
commit7c24de9cb772cc8c0867aef544bf8ddc89745ea2 (patch)
tree579ec45775dc44782825c4e18511e5450962f835
parent158e8d1e922506f73690b7e9100f372187890a82 (diff)
lib/cbfs: Don't load XIP stages from bootblock
This should improve boot times as it skips unnecessary read and writes. Change-Id: I8cf36613903783e741b2e3bfeeee5bc29ab26d5b Signed-off-by: Arthur Heymans <arthur@aheymans.xyz> Reviewed-on: https://review.coreboot.org/c/coreboot/+/36323 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Aaron Durbin <adurbin@chromium.org>
-rw-r--r--src/lib/cbfs.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/cbfs.c b/src/lib/cbfs.c
index 91368fb67d..1e8a93f6e0 100644
--- a/src/lib/cbfs.c
+++ b/src/lib/cbfs.c
@@ -256,7 +256,7 @@ int cbfs_prog_stage_load(struct prog *pstage)
/* Hacky way to not load programs over read only media. The stages
* that would hit this path initialize themselves. */
- if (ENV_VERSTAGE && !CONFIG(NO_XIP_EARLY_STAGES) &&
+ if ((ENV_BOOTBLOCK || ENV_VERSTAGE) && !CONFIG(NO_XIP_EARLY_STAGES) &&
CONFIG(BOOT_DEVICE_MEMORY_MAPPED)) {
void *mapping = rdev_mmap(fh, foffset, fsize);
rdev_munmap(fh, mapping);