<p>John E. Kabat would like Marshall Dawson to <strong>review</strong> this change.</p><p><a href="https://review.coreboot.org/21040">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">amd/padmelon: Fix if IS_ENABLED()<br><br>Convert the #if usage to if().  Complete remove the #if IS_ENABLED<br>that controls including imc.h.<br><br>Change-Id: Ia9f18b40a931c00a0c4d873f40c2ddd853611d63<br>Signed-off-by: Marshall Dawson <marshalldawson3rd@gmail.com><br>---<br>M src/mainboard/amd/padmelon/BiosCallOuts.c<br>1 file changed, 6 insertions(+), 10 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/40/21040/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/src/mainboard/amd/padmelon/BiosCallOuts.c b/src/mainboard/amd/padmelon/BiosCallOuts.c<br>index ac18f94..5c11742 100644<br>--- a/src/mainboard/amd/padmelon/BiosCallOuts.c<br>+++ b/src/mainboard/amd/padmelon/BiosCallOuts.c<br>@@ -23,9 +23,7 @@<br> #include "heapManager.h"<br> #include "FchPlatform.h"<br> #include "cbfs.h"<br>-#if IS_ENABLED(CONFIG_HUDSON_IMC_FWM)<br> #include "imc.h"<br>-#endif<br> #include "hudson.h"<br> #include <stdlib.h><br> #include "BiosCallOuts.h"<br>@@ -77,16 +75,14 @@<br>  } else if (StdHeader->Func == AMD_INIT_ENV) {<br>              FCH_DATA_BLOCK *FchParams_env = (FCH_DATA_BLOCK *)FchData;<br>            printk(BIOS_DEBUG, "Fch OEM config in INIT ENV ");<br>-#if IS_ENABLED(CONFIG_HUDSON_IMC_FWM)<br>-         oem_fan_control(FchParams_env);<br>-#endif<br>+             if (IS_ENABLED(CONFIG_HUDSON_IMC_FWM))<br>+                       oem_fan_control(FchParams_env);<br> <br>            /* XHCI configuration */<br>-#if IS_ENABLED(CONFIG_HUDSON_XHCI_ENABLE)<br>-         FchParams_env->Usb.Xhci0Enable = TRUE;<br>-#else<br>-            FchParams_env->Usb.Xhci0Enable = FALSE;<br>-#endif<br>+          if (IS_ENABLED(CONFIG_HUDSON_XHCI_ENABLE))<br>+                   FchParams_env->Usb.Xhci0Enable = TRUE;<br>+            else<br>+                 FchParams_env->Usb.Xhci0Enable = FALSE;<br>            FchParams_env->Usb.Xhci1Enable = FALSE;<br>            FchParams_env->Usb.USB30PortInit = 8; /* 8: If USB3 port is unremoveable. */<br> <br></pre><p>To view, visit <a href="https://review.coreboot.org/21040">change 21040</a>. To unsubscribe, 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/21040"/><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: Ia9f18b40a931c00a0c4d873f40c2ddd853611d63 </div>
<div style="display:none"> Gerrit-Change-Number: 21040 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: John E. Kabat <sljkrr@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: John E. Kabat Jr. <john.kabat@scarletltd.com> </div>
<div style="display:none"> Gerrit-Reviewer: Marshall Dawson <marshalldawson3rd@gmail.com> </div>