<p>Alexander Couzens has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/27781">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">mb/lenovo/x1_carbon_gen1: add support for hynix memory<br><br>All different memory configuration should be supported by now.<br>Thanks to Igor Lee.<br><br>Change-Id: Ib93c0e3cbdc29cbf6cff26292df4fbbb8208082f<br>Signed-off-by: Alexander Couzens <lynxis@fe80.eu><br>Tested-by: Igor Lee <gerun@gmail.com><br>---<br>M src/mainboard/lenovo/x1_carbon_gen1/romstage.c<br>M src/mainboard/lenovo/x1_carbon_gen1/spd/Makefile.inc<br>A src/mainboard/lenovo/x1_carbon_gen1/spd/hynix.hex<br>3 files changed, 20 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/81/27781/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/mainboard/lenovo/x1_carbon_gen1/romstage.c b/src/mainboard/lenovo/x1_carbon_gen1/romstage.c</span><br><span>index 029d867..87fca34 100644</span><br><span>--- a/src/mainboard/lenovo/x1_carbon_gen1/romstage.c</span><br><span>+++ b/src/mainboard/lenovo/x1_carbon_gen1/romstage.c</span><br><span>@@ -98,7 +98,7 @@</span><br><span> </span><br><span> /* 4gb model = 0, 8gb model = 1 */</span><br><span> /* int extended_memory_version = get_gpio(44); */</span><br><span style="color: hsl(0, 100%, 40%);">- /* TODO: how do they differ? Guess only one slot is connected */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* TODO: how do they differ? 4GB with hynix has to slot populated */</span><br><span> </span><br><span> /*</span><br><span> * GPIO45 GPIO25</span><br><span>@@ -108,10 +108,8 @@</span><br><span> * 1 1 reserved</span><br><span> */</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* We only support elpida and samsung.</span><br><span style="color: hsl(0, 100%, 40%);">- Because the spd data is missing. */</span><br><span style="color: hsl(0, 100%, 40%);">- if (spd_index != 0 && spd_index != 2)</span><br><span style="color: hsl(0, 100%, 40%);">- die("Unsupported Memory. Please add your SPD dump to coreboot.");</span><br><span style="color: hsl(120, 100%, 40%);">+ if (spd_index == 3)</span><br><span style="color: hsl(120, 100%, 40%);">+ die("Unsupported Memory. (detected 'reserved' memory configuration).");</span><br><span> </span><br><span> memory = get_spd_data(spd_index);</span><br><span> memcpy(&spd[0], memory, 256);</span><br><span>diff --git a/src/mainboard/lenovo/x1_carbon_gen1/spd/Makefile.inc b/src/mainboard/lenovo/x1_carbon_gen1/spd/Makefile.inc</span><br><span>index 0c90826..f5c233a 100644</span><br><span>--- a/src/mainboard/lenovo/x1_carbon_gen1/spd/Makefile.inc</span><br><span>+++ b/src/mainboard/lenovo/x1_carbon_gen1/spd/Makefile.inc</span><br><span>@@ -16,7 +16,7 @@</span><br><span> SPD_BIN = $(obj)/spd.bin</span><br><span> </span><br><span> SPD_SOURCES = elpida.hex # 0b0000 Single Channel 2GB</span><br><span style="color: hsl(0, 100%, 40%);">-SPD_SOURCES += samsung.hex # 0b0001 placeholder</span><br><span style="color: hsl(120, 100%, 40%);">+SPD_SOURCES += hynix.hex # 0b0001 2GiB</span><br><span> SPD_SOURCES += samsung.hex # 0b0010 4GiB</span><br><span> SPD_DEPS := $(foreach f, $(SPD_SOURCES), src/mainboard/$(MAINBOARDDIR)/spd/$(f))</span><br><span> </span><br><span>diff --git a/src/mainboard/lenovo/x1_carbon_gen1/spd/hynix.hex b/src/mainboard/lenovo/x1_carbon_gen1/spd/hynix.hex</span><br><span>new file mode 100644</span><br><span>index 0000000..111745c</span><br><span>--- /dev/null</span><br><span>+++ b/src/mainboard/lenovo/x1_carbon_gen1/spd/hynix.hex</span><br><span>@@ -0,0 +1,16 @@</span><br><span style="color: hsl(120, 100%, 40%);">+92 11 0b 03 04 00 00 02 03 52 01 08 0c 00 20 00</span><br><span style="color: hsl(120, 100%, 40%);">+6c 78 6c 3c 6c 11 20 81 28 08 3c 3c 01 68 00 00</span><br><span style="color: hsl(120, 100%, 40%);">+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00</span><br><span style="color: hsl(120, 100%, 40%);">+00 00 00 00 00 00 00 00 00 00 00 00 00 00 65 00</span><br><span style="color: hsl(120, 100%, 40%);">+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00</span><br><span style="color: hsl(120, 100%, 40%);">+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00</span><br><span style="color: hsl(120, 100%, 40%);">+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00</span><br><span style="color: hsl(120, 100%, 40%);">+00 00 00 00 00 00 00 00 00 00 00 00 00 00 ae ea</span><br><span style="color: hsl(120, 100%, 40%);">+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00</span><br><span style="color: hsl(120, 100%, 40%);">+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00</span><br><span style="color: hsl(120, 100%, 40%);">+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00</span><br><span style="color: hsl(120, 100%, 40%);">+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00</span><br><span style="color: hsl(120, 100%, 40%);">+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00</span><br><span style="color: hsl(120, 100%, 40%);">+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00</span><br><span style="color: hsl(120, 100%, 40%);">+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00</span><br><span style="color: hsl(120, 100%, 40%);">+00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/27781">change 27781</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://review.coreboot.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://review.coreboot.org/27781"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: coreboot </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: Ib93c0e3cbdc29cbf6cff26292df4fbbb8208082f </div>
<div style="display:none"> Gerrit-Change-Number: 27781 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Alexander Couzens <lynxis@fe80.eu> </div>