[coreboot-gerrit] Patch set updated for coreboot: nb/i945/gma.c: use an if else statement for use of native init

[Arthur Heymans]

Arthur Heymans ([e-mail]) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/17076

-gerrit

commit abcffd9cab3f1c5037bd27a3af84ea1795357f47
Author: Arthur Heymans 
Date:   Thu Oct 20 20:44:54 2016 +0200

nb/i945/gma.c: use an if else statement for use of native init

Change-Id: I1e964ed939ca5282008253e3fbdd1d2fa5cbf278
    Signed-off-by: Arthur Heymans 
---
 src/northbridge/intel/i945/gma.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/northbridge/intel/i945/gma.c b/src/northbridge/intel/i945/gma.c
index 3e68aa3..c74384a 100644
--- a/src/northbridge/intel/i945/gma.c
+++ b/src/northbridge/intel/i945/gma.c
@@ -594,11 +594,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");
@@ -637,6 +632,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);
    }
 }