[coreboot-gerrit] New patch to review for coreboot: 99a3727 peppy: Duplicate SPD data for 2GB configurations.

[Stefan Reinauer (stefan.reinauer@coreboot.org)]

Stefan Reinauer (stefan.reinauer at coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/4369

-gerrit

commit 99a37278628a4d64b0c5c1da88ce1522e40bd833
Author: Shawn Nematbakhsh <shawnn at chromium.org>
Date:   Sun Jul 14 16:32:42 2013 -0700

    peppy: Duplicate SPD data for 2GB configurations.
    
    Peppy SPD table has 4GB configurations followed by 2GB configurations.
    Current implementation does remapping to point 2GB configuration to the
    same SPD index as the 4GB. This is different than Falco, which simply
    duplicates the SPD data for all configurations. To simplify probing in
    mosys, copy the Falco implementation of duplicating SPD data.
    
    Signed-off-by: Shawn Nematbakhsh <shawnn at chromium.org>
    
    Change-Id: Idb185a437f3cf4f40d2dae1ae59c30235df8f489
    Reviewed-on: https://gerrit.chromium.org/gerrit/61847
    Reviewed-by: Dave Parker <dparker at chromium.org>
    Reviewed-by: Jay Kim <yongjaek at chromium.org>
    Commit-Queue: Shawn Nematbakhsh <shawnn at chromium.org>
    Tested-by: Shawn Nematbakhsh <shawnn at chromium.org>
---
 src/mainboard/google/peppy/Makefile.inc | 10 +++++++---
 src/mainboard/google/peppy/romstage.c   |  3 ---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/mainboard/google/peppy/Makefile.inc b/src/mainboard/google/peppy/Makefile.inc
index a95ee76..62fc6b0 100644
--- a/src/mainboard/google/peppy/Makefile.inc
+++ b/src/mainboard/google/peppy/Makefile.inc
@@ -28,9 +28,13 @@ smm-$(CONFIG_HAVE_SMI_HANDLER) += smihandler.c
 SPD_BIN = $(obj)/spd.bin
 
 # Order of names in SPD_SOURCES is important!
-SPD_SOURCES  = Micron_4KTF25664HZ
-SPD_SOURCES += Hynix_HMT425S6AFR6A
-SPD_SOURCES += Elpida_EDJ4216EFBG
+SPD_SOURCES  = Micron_4KTF25664HZ	# 0: 4GB / CH0 + CH1
+SPD_SOURCES += Hynix_HMT425S6AFR6A	# 1: 4GB / CH0 + CH1
+SPD_SOURCES += Elpida_EDJ4216EFBG	# 2: 4GB / CH0 + CH1
+SPD_SOURCES += Micron_4KTF25664HZ	# 3: Reserved / place holder
+SPD_SOURCES += Micron_4KTF25664HZ	# 4: 2GB / CH0 + CH1
+SPD_SOURCES += Hynix_HMT425S6AFR6A	# 5: 2GB / CH0 + CH1
+SPD_SOURCES += Elpida_EDJ4216EFBG	# 6: 2GB / CH0 + CH1
 
 SPD_DEPS := $(foreach f, $(SPD_SOURCES), src/mainboard/$(MAINBOARDDIR)/$(f).spd.hex)
 
diff --git a/src/mainboard/google/peppy/romstage.c b/src/mainboard/google/peppy/romstage.c
index c213b10..abc082c 100644
--- a/src/mainboard/google/peppy/romstage.c
+++ b/src/mainboard/google/peppy/romstage.c
@@ -97,10 +97,7 @@ static void copy_spd(struct pei_data *peid)
 		/* Index 0-2 are 4GB config with both CH0 and CH1.
 		 * Index 4-6 are 2GB config with CH0 only. */
 		if (spd_index > 3)
-		{
 			peid->dimm_channel1_disabled = 3;
-			spd_index &= 0x03;
-		}
 		break;
 	}