<p>Martin Roth has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/20684">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">I82801JX: Add IS_ENABLED around config options<br><br>This chipset was just added and had a few places that needed to be<br>fixed.<br><br>Change-Id: Ief048c4876c5a2cb538c9cb4b295aba46a4fff62<br>Signed-off-by: Martin Roth <martinroth@google.com><br>---<br>M src/cpu/x86/smm/smmrelocate.S<br>M src/southbridge/intel/i82801jx/acpi/sleepstates.asl<br>M src/southbridge/intel/i82801jx/i82801jx.c<br>M src/southbridge/intel/i82801jx/lpc.c<br>4 files changed, 5 insertions(+), 5 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/84/20684/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/src/cpu/x86/smm/smmrelocate.S b/src/cpu/x86/smm/smmrelocate.S<br>index 23d107a..4d388a9 100644<br>--- a/src/cpu/x86/smm/smmrelocate.S<br>+++ b/src/cpu/x86/smm/smmrelocate.S<br>@@ -29,7 +29,7 @@<br> #include "../../../soc/intel/sch/sch.h"<br> #elif IS_ENABLED(CONFIG_SOUTHBRIDGE_INTEL_I82801IX)<br> #include "../../../southbridge/intel/i82801ix/i82801ix.h"<br>-#elif CONFIG_SOUTHBRIDGE_INTEL_I82801JX<br>+#elif IS_ENABLED(CONFIG_SOUTHBRIDGE_INTEL_I82801JX)<br> #include "../../../southbridge/intel/i82801jx/i82801jx.h"<br> <br> #else<br>diff --git a/src/southbridge/intel/i82801jx/acpi/sleepstates.asl b/src/southbridge/intel/i82801jx/acpi/sleepstates.asl<br>index 62bb026..d7fb2a5 100644<br>--- a/src/southbridge/intel/i82801jx/acpi/sleepstates.asl<br>+++ b/src/southbridge/intel/i82801jx/acpi/sleepstates.asl<br>@@ -15,7 +15,7 @@<br>  */<br> <br> Name(\_S0, Package(){0x0,0x0,0x0,0x0})<br>-#if !CONFIG_HAVE_ACPI_RESUME<br>+#if !IS_ENABLED(CONFIG_HAVE_ACPI_RESUME)<br> Name(\_S1, Package(){0x1,0x0,0x0,0x0})<br> #else<br> Name(\_S3, Package(){0x5,0x0,0x0,0x0})<br>diff --git a/src/southbridge/intel/i82801jx/i82801jx.c b/src/southbridge/intel/i82801jx/i82801jx.c<br>index dca3a41..644524d 100644<br>--- a/src/southbridge/intel/i82801jx/i82801jx.c<br>+++ b/src/southbridge/intel/i82801jx/i82801jx.c<br>@@ -222,7 +222,7 @@<br>  i82801jx_hide_functions();<br> <br>         /* Reset watchdog timer. */<br>-#if !CONFIG_HAVE_SMI_HANDLER<br>+#if !IS_ENABLED(CONFIG_HAVE_SMI_HANDLER)<br>         outw(0x0008, DEFAULT_TCOBASE + 0x12); /* Set higher timer value. */<br> #endif<br>  outw(0x0000, DEFAULT_TCOBASE + 0x00); /* Update timer. */<br>diff --git a/src/southbridge/intel/i82801jx/lpc.c b/src/southbridge/intel/i82801jx/lpc.c<br>index 5d3b6b5..edbd0e8 100644<br>--- a/src/southbridge/intel/i82801jx/lpc.c<br>+++ b/src/southbridge/intel/i82801jx/lpc.c<br>@@ -369,7 +369,7 @@<br>       RCBA32(0x38c0) |= 7;<br> }<br> <br>-#if CONFIG_HAVE_SMI_HANDLER<br>+#if IS_ENABLED(CONFIG_HAVE_SMI_HANDLER)<br> static void i82801jx_lock_smm(struct device *dev)<br> {<br> #if TEST_SMM_FLASH_LOCKDOWN<br>@@ -464,7 +464,7 @@<br>        /* Interrupt 9 should be level triggered (SCI) */<br>     i8259_configure_irq_trigger(9, 1);<br> <br>-#if CONFIG_HAVE_SMI_HANDLER<br>+#if IS_ENABLED(CONFIG_HAVE_SMI_HANDLER)<br>         i82801jx_lock_smm(dev);<br> #endif<br> }<br></pre><p>To view, visit <a href="https://review.coreboot.org/20684">change 20684</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/20684"/><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: Ief048c4876c5a2cb538c9cb4b295aba46a4fff62 </div>
<div style="display:none"> Gerrit-Change-Number: 20684 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Martin Roth <martinroth@google.com> </div>