summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNico Huber <nico.h@gmx.de>2017-08-05 19:26:29 +0200
committerMartin Roth <martinroth@google.com>2017-08-08 18:19:54 +0000
commite9787ff61f81054bfd0c3e3ad214484e1bdf4db3 (patch)
treeaa35d4a93e3cbd3dc206fbc6bc99f40e532d07b2
parent86b9467c0e0165eae8440009eb4ea258ba5b06e0 (diff)
mb/lenovo/x1_carbon_gen1: Add 4GiB SPD index 2
Change-Id: I218fd48c8e29563ef089d60ebde7bc36ac8ab189 Signed-off-by: Nico Huber <nico.h@gmx.de> Reviewed-on: https://review.coreboot.org/20887 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Alexander Couzens <lynxis@fe80.eu>
-rw-r--r--src/mainboard/lenovo/x1_carbon_gen1/romstage.c5
-rw-r--r--src/mainboard/lenovo/x1_carbon_gen1/spd/Makefile.inc2
-rw-r--r--src/mainboard/lenovo/x1_carbon_gen1/spd/samsung.hex16
3 files changed, 21 insertions, 2 deletions
diff --git a/src/mainboard/lenovo/x1_carbon_gen1/romstage.c b/src/mainboard/lenovo/x1_carbon_gen1/romstage.c
index a07df70508..5f7b82e81a 100644
--- a/src/mainboard/lenovo/x1_carbon_gen1/romstage.c
+++ b/src/mainboard/lenovo/x1_carbon_gen1/romstage.c
@@ -108,8 +108,9 @@ void mainboard_get_spd(spd_raw_data *spd, bool id_only)
* 1 1 reserved
*/
- /* we only support elpida. Because the spd data is missing */
- if (spd_index != 0)
+ /* We only support elpida and samsung.
+ Because the spd data is missing. */
+ 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 d1cca0353e..ec6e4f32d7 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 0000000000..24186362b8
--- /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