summaryrefslogtreecommitdiff
path: root/src/devices/device.c
diff options
context:
space:
mode:
authorMarc Jones <marcj303@gmail.com>2012-02-21 17:44:35 +0100
committerMarc Jones <marcj303@gmail.com>2012-02-23 01:29:36 +0100
commit80bd74c21e5dcca3e9aa8543e086405142900664 (patch)
tree11086808eea22c344774ec47d424b735010952b8 /src/devices/device.c
parent91bd3068a7c28d429bb7a2581ccee40645c137c9 (diff)
Revert "Fix multipleVGA cards resource conflict on Windows"
This reverts commit 8660a1aa56caeb31bfaf15464285ca650638515e This commit has been found to cause problems with vbios and option rom init in seabios. It has been found by several people and requires more analysis before being recommitted. Change-Id: Ie5f54e417e7a0d8bd8ca4c0a573976afeaa9e230 Signed-off-by: Marc Jones <marc.jones@se-eng.com> Reviewed-on: http://review.coreboot.org/671 Tested-by: build bot (Jenkins) Reviewed-by: Denis Carikli <GNUtoo@no-log.org> Reviewed-by: Marc Jones <marcj303@gmail.com>
Diffstat (limited to 'src/devices/device.c')
-rw-r--r--src/devices/device.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/devices/device.c b/src/devices/device.c
index 8ad9787431..a2619bf000 100644
--- a/src/devices/device.c
+++ b/src/devices/device.c
@@ -932,6 +932,10 @@ void dev_configure(void)
struct device *root;
struct device *child;
+#if CONFIG_VGA_BRIDGE_SETUP == 1
+ set_vga_bridge_bits();
+#endif
+
printk(BIOS_INFO, "Allocating resources...\n");
root = &dev_root;
@@ -1024,10 +1028,6 @@ void dev_configure(void)
printk(BIOS_INFO, "Done setting resources.\n");
print_resource_tree(root, BIOS_SPEW, "After assigning values.");
-#if CONFIG_VGA_BRIDGE_SETUP == 1
- set_vga_bridge_bits();
-#endif
-
printk(BIOS_INFO, "Done allocating resources.\n");
}