<p>Matt DeVillier has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/28612">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">google/auron: Clean up variant-specific romstage code<br><br>Use an empty weak function for variant_romstage_entry(), rather than<br>having separate empty functions for boards which don't utilize it.<br><br>Change-Id: I7a278ed716484bea377a5dd98d4a534502c8bab6<br>Signed-off-by: Matt DeVillier <matt.devillier@gmail.com><br>---<br>M src/mainboard/google/auron/romstage.c<br>M src/mainboard/google/auron/variants/auron_paine/variant.c<br>M src/mainboard/google/auron/variants/auron_yuna/variant.c<br>3 files changed, 5 insertions(+), 13 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/12/28612/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/mainboard/google/auron/romstage.c b/src/mainboard/google/auron/romstage.c</span><br><span>index aedc33d..aea8e21 100644</span><br><span>--- a/src/mainboard/google/auron/romstage.c</span><br><span>+++ b/src/mainboard/google/auron/romstage.c</span><br><span>@@ -25,6 +25,10 @@</span><br><span> #include <variant/spd.h></span><br><span> #include "variant.h"</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+__weak void variant_romstage_entry(struct romstage_params *rp)</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%);">+</span><br><span> void mainboard_romstage_entry(struct romstage_params *rp)</span><br><span> {</span><br><span>       struct pei_data pei_data;</span><br><span>@@ -43,6 +47,6 @@</span><br><span>        /* Call into the real romstage main with this board's attributes. */</span><br><span>     romstage_common(rp);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-        /* Do variant-specific (read: Samus) init */</span><br><span style="color: hsl(120, 100%, 40%);">+  /* Do variant-specific init */</span><br><span>       variant_romstage_entry(rp);</span><br><span> }</span><br><span>diff --git a/src/mainboard/google/auron/variants/auron_paine/variant.c b/src/mainboard/google/auron/variants/auron_paine/variant.c</span><br><span>index f1af14d..b924976 100644</span><br><span>--- a/src/mainboard/google/auron/variants/auron_paine/variant.c</span><br><span>+++ b/src/mainboard/google/auron/variants/auron_paine/variant.c</span><br><span>@@ -12,7 +12,6 @@</span><br><span>  */</span><br><span> </span><br><span> #include <smbios.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <soc/romstage.h></span><br><span> #include <variant/onboard.h></span><br><span> #include <mainboard/google/auron/variant.h></span><br><span> </span><br><span>@@ -32,8 +31,3 @@</span><br><span> </span><br><span>  return len;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-void variant_romstage_entry(struct romstage_params *rp)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">-        /* N/A for boards other than SAMUS */</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span>diff --git a/src/mainboard/google/auron/variants/auron_yuna/variant.c b/src/mainboard/google/auron/variants/auron_yuna/variant.c</span><br><span>index f1af14d..b924976 100644</span><br><span>--- a/src/mainboard/google/auron/variants/auron_yuna/variant.c</span><br><span>+++ b/src/mainboard/google/auron/variants/auron_yuna/variant.c</span><br><span>@@ -12,7 +12,6 @@</span><br><span>  */</span><br><span> </span><br><span> #include <smbios.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <soc/romstage.h></span><br><span> #include <variant/onboard.h></span><br><span> #include <mainboard/google/auron/variant.h></span><br><span> </span><br><span>@@ -32,8 +31,3 @@</span><br><span> </span><br><span>        return len;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-void variant_romstage_entry(struct romstage_params *rp)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">-        /* N/A for boards other than SAMUS */</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/28612">change 28612</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/28612"/><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: I7a278ed716484bea377a5dd98d4a534502c8bab6 </div>
<div style="display:none"> Gerrit-Change-Number: 28612 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Matt DeVillier <matt.devillier@gmail.com> </div>