<p>Martin Roth has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/20347">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">src/northbridge: add IS_ENABLED() around Kconfig symbol references<br><br>Change-Id: I1095944e65bfacd9e878840cc88f8a0a24ecde72<br>Signed-off-by: Martin Roth <martinroth@google.com><br>---<br>M src/northbridge/via/cn700/raminit.c<br>M src/northbridge/via/cx700/early_smbus.c<br>M src/northbridge/via/cx700/lpc.c<br>M src/northbridge/via/cx700/raminit.c<br>M src/northbridge/via/cx700/vga.c<br>M src/northbridge/via/vx800/early_smbus.c<br>M src/northbridge/via/vx800/raminit.c<br>M src/northbridge/via/vx800/vga.c<br>M src/northbridge/via/vx900/lpc.c<br>9 files changed, 14 insertions(+), 14 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/47/20347/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/src/northbridge/via/cn700/raminit.c b/src/northbridge/via/cn700/raminit.c<br>index 20c3c8c..e8a7a17 100644<br>--- a/src/northbridge/via/cn700/raminit.c<br>+++ b/src/northbridge/via/cn700/raminit.c<br>@@ -24,7 +24,7 @@<br> #include <delay.h><br> #include "cn700.h"<br> <br>-#if CONFIG_DEBUG_RAM_SETUP<br>+#if IS_ENABLED(CONFIG_DEBUG_RAM_SETUP)<br> #define PRINT_DEBUG_MEM(x)           printk(BIOS_DEBUG, x)<br> #define PRINT_DEBUG_MEM_HEX8(x)         printk(BIOS_DEBUG, "%02x", x)<br> #define PRINT_DEBUG_MEM_HEX16(x)      printk(BIOS_DEBUG, "%04x", x)<br>diff --git a/src/northbridge/via/cx700/early_smbus.c b/src/northbridge/via/cx700/early_smbus.c<br>index e106f09..84a0de1 100644<br>--- a/src/northbridge/via/cx700/early_smbus.c<br>+++ b/src/northbridge/via/cx700/early_smbus.c<br>@@ -43,7 +43,7 @@<br> #define SMBUS_DELAY()         outb(0x80, 0x80)<br> <br> /* Internal functions */<br>-#if CONFIG_DEBUG_SMBUS<br>+#if IS_ENABLED(CONFIG_DEBUG_SMBUS)<br> static void smbus_print_error(unsigned char host_status_register, int loops)<br> {<br>       /* Check if there actually was an error */<br>@@ -85,7 +85,7 @@<br>                 SMBUS_DELAY();<br>                ++loops;<br>      }<br>-#if CONFIG_DEBUG_SMBUS<br>+#if IS_ENABLED(CONFIG_DEBUG_SMBUS)<br>       /* Some systems seem to have a flakey SMBus. No need to spew a lot of<br>          * errors on those, once we know that SMBus access is principally<br>      * working.<br>@@ -211,7 +211,7 @@<br> }<br> <br> /* Debugging Function */<br>-#if CONFIG_DEBUG_SMBUS<br>+#if IS_ENABLED(CONFIG_DEBUG_SMBUS)<br> static void dump_spd_data(const struct mem_controller *ctrl)<br> {<br>   int dimm, offset, regs;<br>diff --git a/src/northbridge/via/cx700/lpc.c b/src/northbridge/via/cx700/lpc.c<br>index c90dab7..4915066 100644<br>--- a/src/northbridge/via/cx700/lpc.c<br>+++ b/src/northbridge/via/cx700/lpc.c<br>@@ -266,7 +266,7 @@<br> {<br>         cx700_set_lpc_registers(dev);<br> <br>-#if CONFIG_IOAPIC<br>+#if IS_ENABLED(CONFIG_IOAPIC)<br> #define IO_APIC_ID 2<br>   setup_ioapic(VIO_APIC_VADDR, IO_APIC_ID);<br> #endif<br>diff --git a/src/northbridge/via/cx700/raminit.c b/src/northbridge/via/cx700/raminit.c<br>index a75be41..682f3be 100644<br>--- a/src/northbridge/via/cx700/raminit.c<br>+++ b/src/northbridge/via/cx700/raminit.c<br>@@ -20,7 +20,7 @@<br> #include "registers.h"<br> <br> /* Debugging macros. */<br>-#if CONFIG_DEBUG_RAM_SETUP<br>+#if IS_ENABLED(CONFIG_DEBUG_RAM_SETUP)<br> #define PRINTK_DEBUG(x...)      printk(BIOS_DEBUG, x)<br> #else<br> #define PRINTK_DEBUG(x...)<br>diff --git a/src/northbridge/via/cx700/vga.c b/src/northbridge/via/cx700/vga.c<br>index 7cb84d2..093477a 100644<br>--- a/src/northbridge/via/cx700/vga.c<br>+++ b/src/northbridge/via/cx700/vga.c<br>@@ -27,7 +27,7 @@<br> #include <arch/interrupt.h><br> #include "registers.h"<br> #include <x86emu/regs.h><br>-#if CONFIG_PCI_OPTION_ROM_RUN_REALMODE<br>+#if IS_ENABLED(CONFIG_PCI_OPTION_ROM_RUN_REALMODE)<br> #include <device/oprom/realmode/x86.h><br> #endif<br> <br>@@ -143,7 +143,7 @@<br> <br> static void vga_enable_console(void)<br> {<br>-#if CONFIG_PCI_OPTION_ROM_RUN_REALMODE<br>+#if IS_ENABLED(CONFIG_PCI_OPTION_ROM_RUN_REALMODE)<br>       /* Call VGA BIOS int10 function 0x4f14 to enable main console<br>          * Epia-M does not always autosense the main console so forcing<br>        * it on is good.<br>diff --git a/src/northbridge/via/vx800/early_smbus.c b/src/northbridge/via/vx800/early_smbus.c<br>index 2c8d5bf..816fe28 100644<br>--- a/src/northbridge/via/vx800/early_smbus.c<br>+++ b/src/northbridge/via/vx800/early_smbus.c<br>@@ -45,7 +45,7 @@<br> <br> #define SMBUS_DELAY()            outb(0x80, 0x80)<br> <br>-#if CONFIG_DEBUG_SMBUS<br>+#if IS_ENABLED(CONFIG_DEBUG_SMBUS)<br> #define DEBUG(x...)         printk(BIOS_DEBUG, x)<br> #else<br> #define DEBUG(x...)             while (0) { }<br>@@ -208,7 +208,7 @@<br> }<br> <br> /* Debugging Function */<br>-#if CONFIG_DEBUG_SMBUS<br>+#if IS_ENABLED(CONFIG_DEBUG_SMBUS)<br> static void dump_spd_data(void)<br> {<br>      int dimm, offset, regs;<br>diff --git a/src/northbridge/via/vx800/raminit.c b/src/northbridge/via/vx800/raminit.c<br>index 69b27c6..f97e2f5 100644<br>--- a/src/northbridge/via/vx800/raminit.c<br>+++ b/src/northbridge/via/vx800/raminit.c<br>@@ -24,7 +24,7 @@<br> #pragma clang diagnostic ignored "-Warray-bounds"<br> #endif<br> <br>-#if CONFIG_DEBUG_RAM_SETUP<br>+#if IS_ENABLED(CONFIG_DEBUG_RAM_SETUP)<br> #define PRINT_DEBUG_MEM(x)            printk(BIOS_DEBUG, x)<br> #define PRINT_DEBUG_MEM_HEX8(x)         printk(BIOS_DEBUG, "%02x", x)<br> #define PRINT_DEBUG_MEM_HEX16(x)      printk(BIOS_DEBUG, "%04x", x)<br>diff --git a/src/northbridge/via/vx800/vga.c b/src/northbridge/via/vx800/vga.c<br>index 70a916f..ce499b7 100644<br>--- a/src/northbridge/via/vx800/vga.c<br>+++ b/src/northbridge/via/vx800/vga.c<br>@@ -29,7 +29,7 @@<br> #include <cpu/x86/msr.h><br> #include <arch/interrupt.h><br> #include <x86emu/regs.h><br>-#if CONFIG_PCI_OPTION_ROM_RUN_REALMODE<br>+#if IS_ENABLED(CONFIG_PCI_OPTION_ROM_RUN_REALMODE)<br> #include <device/oprom/realmode/x86.h><br> #endif<br> <br>@@ -139,7 +139,7 @@<br> <br> static void vga_enable_console(void)<br> {<br>-#if CONFIG_PCI_OPTION_ROM_RUN_REALMODE<br>+#if IS_ENABLED(CONFIG_PCI_OPTION_ROM_RUN_REALMODE)<br>       /* Call VGA BIOS int10 function 0x4f14 to enable main console<br>          * Epia-M does not always autosense the main console so forcing<br>        * it on is good.<br>diff --git a/src/northbridge/via/vx900/lpc.c b/src/northbridge/via/vx900/lpc.c<br>index a9d24df..b36aaed 100644<br>--- a/src/northbridge/via/vx900/lpc.c<br>+++ b/src/northbridge/via/vx900/lpc.c<br>@@ -198,7 +198,7 @@<br>   .device = PCI_DEVICE_ID_VIA_VX900_LPC,<br> };<br> <br>-#if CONFIG_PIRQ_ROUTE<br>+#if IS_ENABLED(CONFIG_PIRQ_ROUTE)<br> void pirq_assign_irqs(const u8 * pirq)<br> {<br>       device_t lpc;<br></pre><p>To view, visit <a href="https://review.coreboot.org/20347">change 20347</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/20347"/><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: I1095944e65bfacd9e878840cc88f8a0a24ecde72 </div>
<div style="display:none"> Gerrit-Change-Number: 20347 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Martin Roth <martinroth@google.com> </div>