<p>Martin Roth has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/20565">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">soc/amd/stoneyridge:add IS_ENABLED() around Kconfig symbol references<br><br>Update files that were added since the IS_ENABLED() fix patches<br><br>Change-Id: I7028942ce54b06cd048029f7b93f064beba579ad<br>Signed-off-by: Martin Roth <martinroth@google.com><br>---<br>M src/soc/amd/stoneyridge/acpi/sleepstates.asl<br>M src/soc/amd/stoneyridge/acpi/usb.asl<br>M src/soc/amd/stoneyridge/fadt.c<br>M src/soc/amd/stoneyridge/model_15_init.c<br>M src/soc/amd/stoneyridge/northbridge.c<br>5 files changed, 7 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/65/20565/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/src/soc/amd/stoneyridge/acpi/sleepstates.asl b/src/soc/amd/stoneyridge/acpi/sleepstates.asl<br>index d93f068..c8ad520 100644<br>--- a/src/soc/amd/stoneyridge/acpi/sleepstates.asl<br>+++ b/src/soc/amd/stoneyridge/acpi/sleepstates.asl<br>@@ -23,7 +23,7 @@<br> If (LAnd(SSFG, 0x02)) {<br>        Name(\_S2, Package () {0x02, 0x02, 0x00, 0x00} )        /* (S2) - "light" Suspend to RAM */<br> }<br>-#if CONFIG_HAVE_ACPI_RESUME<br>+#if IS_ENABLED(CONFIG_HAVE_ACPI_RESUME)<br> If (LAnd(SSFG, 0x04)) {<br>   Name(\_S3, Package () {0x03, 0x03, 0x00, 0x00} )        /* (S3) - Suspend to RAM */<br> }<br>diff --git a/src/soc/amd/stoneyridge/acpi/usb.asl b/src/soc/amd/stoneyridge/acpi/usb.asl<br>index b2e5f49..360731e 100644<br>--- a/src/soc/amd/stoneyridge/acpi/usb.asl<br>+++ b/src/soc/amd/stoneyridge/acpi/usb.asl<br>@@ -56,7 +56,8 @@<br>   Name(_PRW, Package() {0x0b, 4})<br> } /* end XHC0 */<br> <br>-#if !CONFIG_SOUTHBRIDGE_AMD_PI_AVALON && !CONFIG_SOUTHBRIDGE_AMD_PI_KERN<br>+#if !IS_ENABLED(CONFIG_SOUTHBRIDGE_AMD_PI_AVALON) && \<br>+    !IS_ENABLED(CONFIG_SOUTHBRIDGE_AMD_PI_KERN)<br> /* 0:10.1 - XHCI 1*/<br> Device(XHC1) {<br>   Name(_ADR, 0x00100001)<br>diff --git a/src/soc/amd/stoneyridge/fadt.c b/src/soc/amd/stoneyridge/fadt.c<br>index fb3410c..f369651 100644<br>--- a/src/soc/amd/stoneyridge/fadt.c<br>+++ b/src/soc/amd/stoneyridge/fadt.c<br>@@ -25,7 +25,7 @@<br> #include <soc/hudson.h><br> #include <soc/smi.h><br> <br>-#if CONFIG_STONEYRIDGE_LEGACY_FREE<br>+#if IS_ENABLED(CONFIG_STONEYRIDGE_LEGACY_FREE)<br>      #define FADT_BOOT_ARCH ACPI_FADT_LEGACY_FREE<br> #else<br>  #define FADT_BOOT_ARCH (ACPI_FADT_LEGACY_DEVICES | ACPI_FADT_8042)<br>diff --git a/src/soc/amd/stoneyridge/model_15_init.c b/src/soc/amd/stoneyridge/model_15_init.c<br>index cad06bf..a46f322 100644<br>--- a/src/soc/amd/stoneyridge/model_15_init.c<br>+++ b/src/soc/amd/stoneyridge/model_15_init.c<br>@@ -54,7 +54,7 @@<br>    u8 i;<br>         msr_t msr;<br>    int msrno;<br>-#if CONFIG_LOGICAL_CPUS<br>+#if IS_ENABLED(CONFIG_LOGICAL_CPUS)<br>    u32 siblings;<br> #endif<br> <br>@@ -92,7 +92,7 @@<br>  /* Enable the local CPU APICs */<br>      setup_lapic();<br> <br>-#if CONFIG_LOGICAL_CPUS<br>+#if IS_ENABLED(CONFIG_LOGICAL_CPUS)<br>     siblings = cpuid_ecx(0x80000008) & 0xff;<br> <br>       if (siblings > 0) {<br>diff --git a/src/soc/amd/stoneyridge/northbridge.c b/src/soc/amd/stoneyridge/northbridge.c<br>index fac966f..eacd82e 100644<br>--- a/src/soc/amd/stoneyridge/northbridge.c<br>+++ b/src/soc/amd/stoneyridge/northbridge.c<br>@@ -48,7 +48,7 @@<br> <br> #define MAX_NODE_NUMS (MAX_NODES * MAX_DIES)<br> <br>-#if (defined CONFIG_EXT_CONF_SUPPORT) && CONFIG_EXT_CONF_SUPPORT == 1<br>+#if IS_ENABLED(CONFIG_EXT_CONF_SUPPORT)<br> #error CONFIG_EXT_CONF_SUPPORT == 1 not support anymore!<br> #endif<br> <br></pre><p>To view, visit <a href="https://review.coreboot.org/20565">change 20565</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/20565"/><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: I7028942ce54b06cd048029f7b93f064beba579ad </div>
<div style="display:none"> Gerrit-Change-Number: 20565 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Martin Roth <martinroth@google.com> </div>