Change in coreboot[master]: mb/lenovo/x1_carbon_gen1: Add 4GiB SPD index 2

[Nico Huber (Code Review)]

Nico Huber has uploaded this change for review. ( https://review.coreboot.org/20887

Change subject: mb/lenovo/x1_carbon_gen1: Add 4GiB SPD index 2
......................................................................

mb/lenovo/x1_carbon_gen1: Add 4GiB SPD index 2

Change-Id: I218fd48c8e29563ef089d60ebde7bc36ac8ab189
Signed-off-by: Nico Huber 
---
M src/mainboard/lenovo/x1_carbon_gen1/romstage.c
M src/mainboard/lenovo/x1_carbon_gen1/spd/Makefile.inc
A src/mainboard/lenovo/x1_carbon_gen1/spd/samsung.hex
3 files changed, 19 insertions(+), 1 deletion(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/87/20887/1

diff --git a/src/mainboard/lenovo/x1_carbon_gen1/romstage.c b/src/mainboard/lenovo/x1_carbon_gen1/romstage.c
index a07df70..458b862 100644
--- a/src/mainboard/lenovo/x1_carbon_gen1/romstage.c
+++ b/src/mainboard/lenovo/x1_carbon_gen1/romstage.c
@@ -109,7 +109,7 @@
     */

/* we only support elpida. Because the spd data is missing */
-	if (spd_index != 0)
+	if (spd_index != 0 && spd_index != 2)
    	die("Unsupported Memory. Please add your SPD dump to coreboot.");

memory = get_spd_data(spd_index);
diff --git a/src/mainboard/lenovo/x1_carbon_gen1/spd/Makefile.inc b/src/mainboard/lenovo/x1_carbon_gen1/spd/Makefile.inc
index d1cca03..ec6e4f3 100644
--- a/src/mainboard/lenovo/x1_carbon_gen1/spd/Makefile.inc
+++ b/src/mainboard/lenovo/x1_carbon_gen1/spd/Makefile.inc
@@ -16,6 +16,8 @@
 SPD_BIN = $(obj)/spd.bin

SPD_SOURCES  = elpida.hex    # 0b0000 Single Channel 2GB
+SPD_SOURCES  = samsung.hex   # 0b0001 placeholder
+SPD_SOURCES  = samsung.hex   # 0b0010 4GiB
 SPD_DEPS := $(foreach f, $(SPD_SOURCES), src/mainboard/$(MAINBOARDDIR)/spd/$(f))

# Include spd ROM data
diff --git a/src/mainboard/lenovo/x1_carbon_gen1/spd/samsung.hex b/src/mainboard/lenovo/x1_carbon_gen1/spd/samsung.hex
new file mode 100644
index 0000000..2418636
--- /dev/null
+++ b/src/mainboard/lenovo/x1_carbon_gen1/spd/samsung.hex
@@ -0,0 +1,16 @@
+92 11 0b 03 04 00 00 0a 03 52 01 08 0c 00 20 00
+6c 78 6c 3c 6c 11 20 81 28 08 3c 3c 01 68 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 65 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 00 00 00 00 00 00 00 00 00 75 c6
+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 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 00 00 00 00
+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00