<p>Richard Spiegel has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/25845">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">soc/amd/stoneyridge/include/soc/smi.h: Fix name colision<br><br>When smi.h is included to southbridge.h (to use SCI/SMI definitions within<br>southbrige.h definitions), this causes a collision of the definition of NONE<br>(ioapic.h also has a NONE definition). As NONE is an enumeration of interrupt<br>types (SCI/SMI), add INTERRUPT_ at the start of each definition.<br><br>This is preparation to have GPIO table/code also declare/program SCI/SMI.<br><br>BUG=b:72875858<br>TEST=Build grunt.<br><br>Change-Id: I5c7b798f9f4d7c2a9f9c606c7ebffb7004a37b99<br>Signed-off-by: Richard Spiegel <richard.spiegel@silverbackltd.com><br>---<br>M src/soc/amd/stoneyridge/include/soc/smi.h<br>1 file changed, 4 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/45/25845/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/soc/amd/stoneyridge/include/soc/smi.h b/src/soc/amd/stoneyridge/include/soc/smi.h</span><br><span>index 34d3d74..636f9c3 100644</span><br><span>--- a/src/soc/amd/stoneyridge/include/soc/smi.h</span><br><span>+++ b/src/soc/amd/stoneyridge/include/soc/smi.h</span><br><span>@@ -201,10 +201,10 @@</span><br><span> };</span><br><span> </span><br><span> enum smi_sci_type {</span><br><span style="color: hsl(0, 100%, 40%);">-  NONE,</span><br><span style="color: hsl(0, 100%, 40%);">-   SCI,</span><br><span style="color: hsl(0, 100%, 40%);">-    SMI,</span><br><span style="color: hsl(0, 100%, 40%);">-    BOTH,</span><br><span style="color: hsl(120, 100%, 40%);">+ INTERRUPT_NONE,</span><br><span style="color: hsl(120, 100%, 40%);">+       INTERRUPT_SCI,</span><br><span style="color: hsl(120, 100%, 40%);">+        INTERRUPT_SMI,</span><br><span style="color: hsl(120, 100%, 40%);">+        INTERRUPT_BOTH,</span><br><span> };</span><br><span> </span><br><span> enum smi_sci_lvl {</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/25845">change 25845</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/25845"/><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: I5c7b798f9f4d7c2a9f9c606c7ebffb7004a37b99 </div>
<div style="display:none"> Gerrit-Change-Number: 25845 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Richard Spiegel <richard.spiegel@silverbackltd.com> </div>