<p>Marc Jones has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/27486">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">mainboard/google/kahlee: Add mainboard resume function<br><br>Add the mainboard resume function and __weak variant override.<br><br>Change-Id: I808734208bd1ce81428771ea203709b53db56cd3<br>Signed-off-by: Marc Jones <marcj303@gmail.com><br>---<br>M src/mainboard/google/kahlee/mainboard.c<br>M src/mainboard/google/kahlee/variants/baseboard/include/baseboard/variants.h<br>2 files changed, 17 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/86/27486/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/mainboard/google/kahlee/mainboard.c b/src/mainboard/google/kahlee/mainboard.c</span><br><span>index cf600d2..2efcb20 100644</span><br><span>--- a/src/mainboard/google/kahlee/mainboard.c</span><br><span>+++ b/src/mainboard/google/kahlee/mainboard.c</span><br><span>@@ -190,18 +190,31 @@</span><br><span>  return variant_get_ehci_oc_map(map);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#if IS_ENABLED(CONFIG_HAVE_ACPI_RESUME)</span><br><span style="color: hsl(120, 100%, 40%);">+void mainboard_suspend_resume(void)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+        variant_mainboard_suspend_resume();</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> struct chip_operations mainboard_ops = {</span><br><span>         .init = mainboard_init,</span><br><span>      .enable_dev = kahlee_enable,</span><br><span>         .final = mainboard_final,</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* Variants may override this function so see definitions in variants/ */</span><br><span style="color: hsl(120, 100%, 40%);">+/* Variants may override these functions so see definitions in variants/ */</span><br><span> uint8_t __weak variant_board_sku(void)</span><br><span> {</span><br><span>     return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#if IS_ENABLED(CONFIG_HAVE_ACPI_RESUME)</span><br><span style="color: hsl(120, 100%, 40%);">+void __weak variant_mainboard_suspend_resume(void)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> const char *smbios_mainboard_sku(void)</span><br><span> {</span><br><span>       static char sku_str[7]; /* sku{0..255} */</span><br><span>diff --git a/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/variants.h b/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/variants.h</span><br><span>index 23f9cb0..6e89105 100644</span><br><span>--- a/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/variants.h</span><br><span>+++ b/src/mainboard/google/kahlee/variants/baseboard/include/baseboard/variants.h</span><br><span>@@ -30,5 +30,8 @@</span><br><span> const struct soc_amd_gpio *variant_early_gpio_table(size_t *size);</span><br><span> const struct soc_amd_gpio *variant_gpio_table(size_t *size);</span><br><span> void variant_romstage_entry(int s3_resume);</span><br><span style="color: hsl(120, 100%, 40%);">+#if IS_ENABLED(CONFIG_HAVE_ACPI_RESUME)</span><br><span style="color: hsl(120, 100%, 40%);">+void variant_mainboard_suspend_resume(void);</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span> </span><br><span> #endif /* __BASEBOARD_VARIANTS_H__ */</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/27486">change 27486</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/27486"/><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: I808734208bd1ce81428771ea203709b53db56cd3 </div>
<div style="display:none"> Gerrit-Change-Number: 27486 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Marc Jones <marc@marcjonesconsulting.com> </div>