From 77a58b92e8d44d17b9aa06710ed728a697722b4a Mon Sep 17 00:00:00 2001 From: Martin Roth Date: Sat, 24 Jun 2017 14:45:48 -0600 Subject: nb/amd: add IS_ENABLED() around Kconfig symbol references MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Some of these can be changed from #if to if(), but that will happen in a follow-on commmit. Change-Id: I763cbbc31dcd4cdd128c04793a742ab6daaf5f0c Signed-off-by: Martin Roth Reviewed-on: https://review.coreboot.org/20345 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer Reviewed-by: Kyösti Mälkki --- src/northbridge/amd/agesa/family12/northbridge.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/northbridge/amd/agesa/family12/northbridge.c') diff --git a/src/northbridge/amd/agesa/family12/northbridge.c b/src/northbridge/amd/agesa/family12/northbridge.c index 206ae4795b..3bf46078dd 100644 --- a/src/northbridge/amd/agesa/family12/northbridge.c +++ b/src/northbridge/amd/agesa/family12/northbridge.c @@ -362,7 +362,7 @@ static void set_resource(device_t dev, struct resource *resource, u32 nodeid) } -#if CONFIG_CONSOLE_VGA_MULTI +#if IS_ENABLED(CONFIG_CONSOLE_VGA_MULTI) extern device_t vga_pri; // the primary vga device, defined in device.c #endif @@ -376,7 +376,7 @@ printk(BIOS_DEBUG, "\nFam12h - northbridge.c - %s - Start.\n",__func__); * we only deal with the 'first' vga card */ for (link = dev->link_list; link; link = link->next) { if (link->bridge_ctrl & PCI_BRIDGE_CTL_VGA) { -#if CONFIG_CONSOLE_VGA_MULTI +#if IS_ENABLED(CONFIG_CONSOLE_VGA_MULTI) printk(BIOS_DEBUG, "VGA: vga_pri bus num = %d bus range [%d,%d]\n", vga_pri->bus->secondary, link->secondary,link->subordinate); /* We need to make sure the vga_pri is under the link */ @@ -600,7 +600,7 @@ static void domain_enable_resources(device_t dev) printk(BIOS_DEBUG, "\nFam12h - northbridge.c - %s - Start.\n",__func__); /* Must be called after PCI enumeration and resource allocation */ -#if CONFIG_AMD_SB_CIMX +#if IS_ENABLED(CONFIG_AMD_SB_CIMX) sb_After_Pci_Init(); sb_Mid_Post_Init(); #endif -- cgit v1.2.3