aboutsummaryrefslogtreecommitdiff
path: root/src/northbridge/via/cx700
diff options
context:
space:
mode:
authorMartin Roth <martinroth@google.com>2017-06-24 15:00:56 -0600
committerMartin Roth <martinroth@google.com>2017-07-07 21:32:27 +0000
commit3c35ad90534d4aebd6d9723e4614efb6af01f45c (patch)
treef1f329d247e541fe36bc30541959b73be04ed891 /src/northbridge/via/cx700
parent894977b2cda924d7db9e2819c8941e2d4cf6a9a4 (diff)
src/northbridge: add IS_ENABLED() around Kconfig symbol references
Change-Id: I1095944e65bfacd9e878840cc88f8a0a24ecde72 Signed-off-by: Martin Roth <martinroth@google.com> Reviewed-on: https://review.coreboot.org/20347 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Diffstat (limited to 'src/northbridge/via/cx700')
-rw-r--r--src/northbridge/via/cx700/early_smbus.c6
-rw-r--r--src/northbridge/via/cx700/lpc.c2
-rw-r--r--src/northbridge/via/cx700/raminit.c2
-rw-r--r--src/northbridge/via/cx700/vga.c4
4 files changed, 7 insertions, 7 deletions
diff --git a/src/northbridge/via/cx700/early_smbus.c b/src/northbridge/via/cx700/early_smbus.c
index e106f09d5e..84a0de19e8 100644
--- a/src/northbridge/via/cx700/early_smbus.c
+++ b/src/northbridge/via/cx700/early_smbus.c
@@ -43,7 +43,7 @@
#define SMBUS_DELAY() outb(0x80, 0x80)
/* Internal functions */
-#if CONFIG_DEBUG_SMBUS
+#if IS_ENABLED(CONFIG_DEBUG_SMBUS)
static void smbus_print_error(unsigned char host_status_register, int loops)
{
/* Check if there actually was an error */
@@ -85,7 +85,7 @@ static void smbus_wait_until_ready(void)
SMBUS_DELAY();
++loops;
}
-#if CONFIG_DEBUG_SMBUS
+#if IS_ENABLED(CONFIG_DEBUG_SMBUS)
/* Some systems seem to have a flakey SMBus. No need to spew a lot of
* errors on those, once we know that SMBus access is principally
* working.
@@ -211,7 +211,7 @@ static void enable_smbus(void)
}
/* Debugging Function */
-#if CONFIG_DEBUG_SMBUS
+#if IS_ENABLED(CONFIG_DEBUG_SMBUS)
static void dump_spd_data(const struct mem_controller *ctrl)
{
int dimm, offset, regs;
diff --git a/src/northbridge/via/cx700/lpc.c b/src/northbridge/via/cx700/lpc.c
index c90dab7b84..4915066386 100644
--- a/src/northbridge/via/cx700/lpc.c
+++ b/src/northbridge/via/cx700/lpc.c
@@ -266,7 +266,7 @@ static void cx700_lpc_init(struct device *dev)
{
cx700_set_lpc_registers(dev);
-#if CONFIG_IOAPIC
+#if IS_ENABLED(CONFIG_IOAPIC)
#define IO_APIC_ID 2
setup_ioapic(VIO_APIC_VADDR, IO_APIC_ID);
#endif
diff --git a/src/northbridge/via/cx700/raminit.c b/src/northbridge/via/cx700/raminit.c
index a75be41745..682f3be16e 100644
--- a/src/northbridge/via/cx700/raminit.c
+++ b/src/northbridge/via/cx700/raminit.c
@@ -20,7 +20,7 @@
#include "registers.h"
/* Debugging macros. */
-#if CONFIG_DEBUG_RAM_SETUP
+#if IS_ENABLED(CONFIG_DEBUG_RAM_SETUP)
#define PRINTK_DEBUG(x...) printk(BIOS_DEBUG, x)
#else
#define PRINTK_DEBUG(x...)
diff --git a/src/northbridge/via/cx700/vga.c b/src/northbridge/via/cx700/vga.c
index 7cb84d2d7e..093477acff 100644
--- a/src/northbridge/via/cx700/vga.c
+++ b/src/northbridge/via/cx700/vga.c
@@ -27,7 +27,7 @@
#include <arch/interrupt.h>
#include "registers.h"
#include <x86emu/regs.h>
-#if CONFIG_PCI_OPTION_ROM_RUN_REALMODE
+#if IS_ENABLED(CONFIG_PCI_OPTION_ROM_RUN_REALMODE)
#include <device/oprom/realmode/x86.h>
#endif
@@ -143,7 +143,7 @@ static void write_protect_vgabios(void)
static void vga_enable_console(void)
{
-#if CONFIG_PCI_OPTION_ROM_RUN_REALMODE
+#if IS_ENABLED(CONFIG_PCI_OPTION_ROM_RUN_REALMODE)
/* Call VGA BIOS int10 function 0x4f14 to enable main console
* Epia-M does not always autosense the main console so forcing
* it on is good.