aboutsummaryrefslogtreecommitdiff
path: root/src/northbridge/via/vx800
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/vx800
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/vx800')
-rw-r--r--src/northbridge/via/vx800/early_smbus.c4
-rw-r--r--src/northbridge/via/vx800/raminit.c2
-rw-r--r--src/northbridge/via/vx800/vga.c4
3 files changed, 4 insertions, 6 deletions
diff --git a/src/northbridge/via/vx800/early_smbus.c b/src/northbridge/via/vx800/early_smbus.c
index 2c8d5bf47c..816fe28740 100644
--- a/src/northbridge/via/vx800/early_smbus.c
+++ b/src/northbridge/via/vx800/early_smbus.c
@@ -45,7 +45,7 @@
#define SMBUS_DELAY() outb(0x80, 0x80)
-#if CONFIG_DEBUG_SMBUS
+#if IS_ENABLED(CONFIG_DEBUG_SMBUS)
#define DEBUG(x...) printk(BIOS_DEBUG, x)
#else
#define DEBUG(x...) while (0) { }
@@ -208,7 +208,7 @@ void smbus_fixup(const struct mem_controller *mem_ctrl)
}
/* Debugging Function */
-#if CONFIG_DEBUG_SMBUS
+#if IS_ENABLED(CONFIG_DEBUG_SMBUS)
static void dump_spd_data(void)
{
int dimm, offset, regs;
diff --git a/src/northbridge/via/vx800/raminit.c b/src/northbridge/via/vx800/raminit.c
index 69b27c6cda..f97e2f51bb 100644
--- a/src/northbridge/via/vx800/raminit.c
+++ b/src/northbridge/via/vx800/raminit.c
@@ -24,7 +24,7 @@
#pragma clang diagnostic ignored "-Warray-bounds"
#endif
-#if CONFIG_DEBUG_RAM_SETUP
+#if IS_ENABLED(CONFIG_DEBUG_RAM_SETUP)
#define PRINT_DEBUG_MEM(x) printk(BIOS_DEBUG, x)
#define PRINT_DEBUG_MEM_HEX8(x) printk(BIOS_DEBUG, "%02x", x)
#define PRINT_DEBUG_MEM_HEX16(x) printk(BIOS_DEBUG, "%04x", x)
diff --git a/src/northbridge/via/vx800/vga.c b/src/northbridge/via/vx800/vga.c
index 70a916f195..4109f62546 100644
--- a/src/northbridge/via/vx800/vga.c
+++ b/src/northbridge/via/vx800/vga.c
@@ -29,9 +29,7 @@
#include <cpu/x86/msr.h>
#include <arch/interrupt.h>
#include <x86emu/regs.h>
-#if CONFIG_PCI_OPTION_ROM_RUN_REALMODE
#include <device/oprom/realmode/x86.h>
-#endif
/* PCI Domain 1 Device 0 Function 0 */
@@ -139,7 +137,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.