aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/mainboard/google/peppy/Makefile.inc10
-rw-r--r--src/mainboard/google/peppy/romstage.c3
2 files changed, 7 insertions, 6 deletions
diff --git a/src/mainboard/google/peppy/Makefile.inc b/src/mainboard/google/peppy/Makefile.inc
index a95ee76be5..62fc6b07fe 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 c213b10b69..abc082c8eb 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;
}