nb/intel/x4x: Use a variable for s3resume
This helps towards unified chipset_power_state.
Change-Id: I8f152dc9f1e0f26e4777489913e9fb2c9cd3dac0
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/50974
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
diff --git a/src/northbridge/intel/x4x/raminit.c b/src/northbridge/intel/x4x/raminit.c
index 59abe4d..8ff0ffc 100644
--- a/src/northbridge/intel/x4x/raminit.c
+++ b/src/northbridge/intel/x4x/raminit.c
@@ -688,11 +688,14 @@
printk(BIOS_DEBUG, "RAM initialization finished.\n");
- cbmem_was_inited = !cbmem_recovery(s.boot_path == BOOT_PATH_RESUME);
+ int s3resume = boot_path == BOOT_PATH_RESUME;
+
+ cbmem_was_inited = !cbmem_recovery(s3resume);
if (!fast_boot)
mrc_cache_stash_data(MRC_TRAINING_DATA, MRC_CACHE_VERSION,
&s, sizeof(s));
- if (s.boot_path == BOOT_PATH_RESUME && !cbmem_was_inited) {
+
+ if (s3resume && !cbmem_was_inited) {
/* Failed S3 resume, reset to come up cleanly */
system_reset();
}