From f41eea4c0c4266a65c98fed902a4b95ced452c40 Mon Sep 17 00:00:00 2001 From: Matt DeVillier Date: Thu, 26 Dec 2019 20:10:32 -0600 Subject: mb/google/peppy: Add Hynix memory HMT425S6CFR6A support Adapted from Chromium commit b8dcb1a [Peppy: Update Memory IDs] Add Hynix memory HMT425S6CFR6A support. RAM_ID: 011 4GB Hynix HMT425S6CFR6A RAM_ID: 111 2GB Hynix HMT425S6CFR6A Original-Change-Id: I26d5c4ad00509e7823c325ee8391e0b18fee44d8 Original-Signed-off-by: David Wu Original-Reviewed-on: https://chromium-review.googlesource.com/1074849 Original-Reviewed-by: Duncan Laurie Original-Tested-by: David Wu Change-Id: I4d165f61b8a13e5ed025e9ddbc4330db88e2fa3d Signed-off-by: Matt DeVillier Reviewed-on: https://review.coreboot.org/c/coreboot/+/37941 Tested-by: build bot (Jenkins) Reviewed-by: Angel Pons --- src/mainboard/google/slippy/variants/peppy/Makefile.inc | 3 ++- src/mainboard/google/slippy/variants/peppy/romstage.c | 4 ++-- .../variants/peppy/spd/Hynix_HMT425S6CFR6A.spd.hex | 17 +++++++++++++++++ 3 files changed, 21 insertions(+), 3 deletions(-) create mode 100644 src/mainboard/google/slippy/variants/peppy/spd/Hynix_HMT425S6CFR6A.spd.hex (limited to 'src/mainboard/google') diff --git a/src/mainboard/google/slippy/variants/peppy/Makefile.inc b/src/mainboard/google/slippy/variants/peppy/Makefile.inc index 9d19818046..d5c59e3b49 100644 --- a/src/mainboard/google/slippy/variants/peppy/Makefile.inc +++ b/src/mainboard/google/slippy/variants/peppy/Makefile.inc @@ -20,10 +20,11 @@ SPD_BIN = $(obj)/spd.bin 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 += Hynix_HMT425S6CFR6A # 3: 4GB / CH0 + CH1 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_SOURCES += Hynix_HMT425S6CFR6A # 7: 2GB / CH0 + CH1 SPD_DEPS := $(foreach f, $(SPD_SOURCES), src/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/spd/$(f).spd.hex) diff --git a/src/mainboard/google/slippy/variants/peppy/romstage.c b/src/mainboard/google/slippy/variants/peppy/romstage.c index a6815c8817..8adf4b2647 100644 --- a/src/mainboard/google/slippy/variants/peppy/romstage.c +++ b/src/mainboard/google/slippy/variants/peppy/romstage.c @@ -107,8 +107,8 @@ static void copy_spd(struct pei_data *peid) case PEPPY_BOARD_VERSION_EVT: default: - /* Index 0-2 are 4GB config with both CH0 and CH1. - * Index 4-6 are 2GB config with CH0 only. */ + /* Index 0-3 are 4GB config with both CH0 and CH1. + * Index 4-7 are 2GB config with CH0 only. */ if (spd_index > 3) peid->dimm_channel1_disabled = 3; else diff --git a/src/mainboard/google/slippy/variants/peppy/spd/Hynix_HMT425S6CFR6A.spd.hex b/src/mainboard/google/slippy/variants/peppy/spd/Hynix_HMT425S6CFR6A.spd.hex new file mode 100644 index 0000000000..8ced79063f --- /dev/null +++ b/src/mainboard/google/slippy/variants/peppy/spd/Hynix_HMT425S6CFR6A.spd.hex @@ -0,0 +1,17 @@ +# Hynix HMT425S6CFR6A-PBA +92 13 0B 03 04 19 02 02 03 52 01 08 0A 00 FE 00 +69 78 69 3C 69 11 18 81 20 08 3C 3C 01 40 83 01 +00 00 00 00 00 00 00 00 00 88 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 0F 11 62 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 80 AD 01 00 00 00 00 00 00 C9 C0 +48 4D 54 34 32 35 53 36 43 46 52 36 41 2D 50 42 +20 20 4E 30 80 AD 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF +FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF +FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF +FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF +FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF -- cgit v1.2.3