From 0145b2005432e4fa2a9f00d0106e9fd8aa8a5891 Mon Sep 17 00:00:00 2001 From: Arthur Heymans Date: Sat, 22 Apr 2017 16:19:56 +0200 Subject: [PATCH] UPSTREAM: nb/pineview/raminit: Don't do Jedec init on resume from S3 This is not needed. BUG=none BRANCH=none TEST=none Change-Id: I437db7d3f171d24909c0f0c3d59ee324c8e170b0 Signed-off-by: Patrick Georgi Original-Commit-Id: d2ca9d12dcda7f9ad77fe187af5f439072b4592f Original-Change-Id: Id19a00c1546b7a71d90aa8c7e43e6efde1e9fbbc Original-Signed-off-by: Arthur Heymans Original-Reviewed-on: https://review.coreboot.org/19425 Original-Reviewed-by: Kysti Mlkki Original-Tested-by: build bot (Jenkins) Original-Reviewed-by: Paul Menzel Reviewed-on: https://chromium-review.googlesource.com/488282 --- src/northbridge/intel/pineview/raminit.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/northbridge/intel/pineview/raminit.c b/src/northbridge/intel/pineview/raminit.c index 330c912a12..cf6cbb9e0b 100644 --- a/src/northbridge/intel/pineview/raminit.c +++ b/src/northbridge/intel/pineview/raminit.c @@ -2616,10 +2616,10 @@ void sdram_initialize(int boot_path, const u8 *spd_addresses) if (si.boot_path != BOOT_PATH_RESUME) { MCHBAR32(0x260) = MCHBAR32(0x260) | (1 << 27); - } - sdram_jedecinit(&si); - PRINTK_DEBUG("Done MRS\n"); + sdram_jedecinit(&si); + PRINTK_DEBUG("Done MRS\n"); + } sdram_misc(&si); PRINTK_DEBUG("Done misc\n");