Patrick Georgi submitted this change.

View Change

drivers/mrc_cache: Fix with VBOOT & VBOOT_STARTS_IN_ROMSTAGE

This guards code accessing the vboot context which does not exist if
vboot starts after romstage.

Change-Id: I2a38daa00d6d18df9c5e22858530814e23bb3e00
Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/52157
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Frans Hendriks <fhendriks@eltan.com>
---
M src/drivers/mrc_cache/mrc_cache.c
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/drivers/mrc_cache/mrc_cache.c b/src/drivers/mrc_cache/mrc_cache.c
index 8b26ea5..f97031d 100644
--- a/src/drivers/mrc_cache/mrc_cache.c
+++ b/src/drivers/mrc_cache/mrc_cache.c
@@ -285,7 +285,8 @@
 	 * In recovery mode, force retraining if the memory retrain
 	 * switch is set.
 	 */
-	if (vboot_recovery_mode_enabled() && get_recovery_mode_retrain_switch())
+	if (CONFIG(VBOOT_STARTS_IN_BOOTBLOCK) && vboot_recovery_mode_enabled()
+	    && get_recovery_mode_retrain_switch())
 		return -1;
 
 	cr = lookup_region(&region, type);

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