From f3f4bea6b53cd21823a196096cca4bcb31be4b73 Mon Sep 17 00:00:00 2001 From: Arthur Heymans Date: Thu, 20 Oct 2016 20:44:54 +0200 Subject: nb/i945/gma.c: use an if else statement for use of native init Change-Id: I1e964ed939ca5282008253e3fbdd1d2fa5cbf278 Signed-off-by: Arthur Heymans Reviewed-on: https://review.coreboot.org/17076 Reviewed-by: Nico Huber Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel --- src/northbridge/intel/i945/gma.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src/northbridge/intel/i945/gma.c') diff --git a/src/northbridge/intel/i945/gma.c b/src/northbridge/intel/i945/gma.c index 1a600d489b..bb0bb7300f 100644 --- a/src/northbridge/intel/i945/gma.c +++ b/src/northbridge/intel/i945/gma.c @@ -595,11 +595,6 @@ static void gma_func0_init(struct device *dev) pci_write_config32(dev, PCI_COMMAND, reg32 | PCI_COMMAND_MASTER | PCI_COMMAND_IO | PCI_COMMAND_MEMORY); - if (!IS_ENABLED(CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT)) { - /* PCI Init, will run VBIOS */ - pci_dev_init(dev); - } - if (IS_ENABLED(CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT)) { /* This should probably run before post VBIOS init. */ printk(BIOS_SPEW, "Initializing VGA without OPROM.\n"); @@ -638,6 +633,9 @@ static void gma_func0_init(struct device *dev) generate_fake_intel_oprom(&conf->gfx, dev, "$VBT LAKEPORT-G"); } + } else { + /* PCI Init, will run VBIOS */ + pci_dev_init(dev); } } -- cgit v1.2.3