summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArthur Heymans <arthur@aheymans.xyz>2016-10-20 20:44:54 +0200
committerMartin Roth <martinroth@google.com>2016-11-02 18:11:28 +0100
commitf3f4bea6b53cd21823a196096cca4bcb31be4b73 (patch)
treef2581a362b398363bc2a0112dbffd69941b8db1f
parentd0e0118be888604e6d7e462ccf703115f655de39 (diff)
downloadcoreboot-f3f4bea6b53cd21823a196096cca4bcb31be4b73.tar.xz
nb/i945/gma.c: use an if else statement for use of native init
Change-Id: I1e964ed939ca5282008253e3fbdd1d2fa5cbf278 Signed-off-by: Arthur Heymans <arthur@aheymans.xyz> Reviewed-on: https://review.coreboot.org/17076 Reviewed-by: Nico Huber <nico.h@gmx.de> Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
-rw-r--r--src/northbridge/intel/i945/gma.c8
1 files changed, 3 insertions, 5 deletions
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);
}
}