summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/devices/Kconfig7
-rw-r--r--src/devices/device.c5
-rw-r--r--src/northbridge/amd/gx2/Kconfig2
3 files changed, 1 insertions, 13 deletions
diff --git a/src/devices/Kconfig b/src/devices/Kconfig
index 5168819519..cec2048931 100644
--- a/src/devices/Kconfig
+++ b/src/devices/Kconfig
@@ -18,13 +18,6 @@
## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
##
-config VGA_BRIDGE_SETUP
- bool "Setup bridges on path to VGA adapter"
- default y
- help
- Allow bridges to set up legacy decoding ranges for VGA. Don't disable
- this unless you're sure you don't want the briges setup for VGA.
-
# TODO: Explain differences (if any) for onboard cards.
config VGA_ROM_RUN
bool "Run VGA Option ROMs"
diff --git a/src/devices/device.c b/src/devices/device.c
index c378078de2..d3f9b52cc4 100644
--- a/src/devices/device.c
+++ b/src/devices/device.c
@@ -705,7 +705,6 @@ static void avoid_fixed_resources(struct device *dev)
}
}
-#if CONFIG_VGA_BRIDGE_SETUP
device_t vga_pri = 0;
static void set_vga_bridge_bits(void)
{
@@ -781,8 +780,6 @@ static void set_vga_bridge_bits(void)
}
}
-#endif
-
/**
* Assign the computed resources to the devices on the bus.
*
@@ -964,9 +961,7 @@ void dev_configure(void)
struct device *root;
struct device *child;
-#if CONFIG_VGA_BRIDGE_SETUP
set_vga_bridge_bits();
-#endif
printk(BIOS_INFO, "Allocating resources...\n");
diff --git a/src/northbridge/amd/gx2/Kconfig b/src/northbridge/amd/gx2/Kconfig
index ae532bd005..5140409b97 100644
--- a/src/northbridge/amd/gx2/Kconfig
+++ b/src/northbridge/amd/gx2/Kconfig
@@ -24,7 +24,7 @@ config NORTHBRIDGE_AMD_GX2
choice
prompt "Framebuffer size"
default GX2_VIDEO_MB_8MB
- depends on NORTHBRIDGE_AMD_GX2 && VGA_BRIDGE_SETUP
+ depends on NORTHBRIDGE_AMD_GX2
config GX2_VIDEO_MB_4MB
bool "4MB"