VGA code needs to be refactored before it can be compiled conditionally.

Revert until someone with the boards refactors it.

Signed-off-by: Myles Watson <mylesgw@gmail.com>
Acked-by: Myles Watson <mylesgw@gmail.com>



git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5681 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

7 files changed, 7 insertions, 7 deletions

diff --git a/src/northbridge/intel/i82830/Makefile.inc b/src/northbridge/intel/i82830/Makefile.inc
index 85a2b0c1bb..57dedfde73 100644
--- a/src/northbridge/intel/i82830/Makefile.inc
+++ b/src/northbridge/intel/i82830/Makefile.inc
@@ -1,4 +1,4 @@
 driver-y += northbridge.o
-driver-$(CONFIG_VGA_ROM_RUN) += vga.o
+driver-y += vga.o
 
 smmobj-$(CONFIG_HAVE_SMI_HANDLER) += i82830_smihandler.o
diff --git a/src/northbridge/via/cn400/Makefile.inc b/src/northbridge/via/cn400/Makefile.inc
index 37f8e4f2ef..89bff39862 100644
--- a/src/northbridge/via/cn400/Makefile.inc
+++ b/src/northbridge/via/cn400/Makefile.inc
@@ -20,6 +20,6 @@
 
 driver-y += northbridge.o
 driver-y += agp.o
-driver-$(CONFIG_VGA_ROM_RUN) += vga.o
+driver-y += vga.o
 driver-y += vlink.o
 
diff --git a/src/northbridge/via/cn700/Makefile.inc b/src/northbridge/via/cn700/Makefile.inc
index f5be8ac74e..c0aa7b9e43 100644
--- a/src/northbridge/via/cn700/Makefile.inc
+++ b/src/northbridge/via/cn700/Makefile.inc
@@ -20,5 +20,5 @@
 
 driver-y += northbridge.o
 driver-y += agp.o
-driver-$(CONFIG_VGA_ROM_RUN) += vga.o
+driver-y += vga.o
 
diff --git a/src/northbridge/via/cx700/Makefile.inc b/src/northbridge/via/cx700/Makefile.inc
index 9b7a42c57e..1221fd5f8b 100644
--- a/src/northbridge/via/cx700/Makefile.inc
+++ b/src/northbridge/via/cx700/Makefile.inc
@@ -23,4 +23,4 @@ obj-y += northbridge.o
 driver-y += cx700_agp.o
 driver-y += cx700_lpc.o
 driver-y += cx700_sata.o
-driver-$(CONFIG_VGA_ROM_RUN) += cx700_vga.o
+driver-y += cx700_vga.o
diff --git a/src/northbridge/via/vt8623/Makefile.inc b/src/northbridge/via/vt8623/Makefile.inc
index 13cbc723c1..47682ad13d 100644
--- a/src/northbridge/via/vt8623/Makefile.inc
+++ b/src/northbridge/via/vt8623/Makefile.inc
@@ -19,5 +19,5 @@
 ##
 
 driver-y += northbridge.o
-driver-$(CONFIG_VGA_ROM_RUN) += vga.o
+driver-y += vga.o
 
diff --git a/src/northbridge/via/vx800/Makefile.inc b/src/northbridge/via/vx800/Makefile.inc
index f46a58f8e6..c44266d0c3 100644
--- a/src/northbridge/via/vx800/Makefile.inc
+++ b/src/northbridge/via/vx800/Makefile.inc
@@ -19,7 +19,7 @@
 ##
 
 driver-y += northbridge.o
-driver-$(CONFIG_VGA_ROM_RUN) += vga.o
+driver-y += vga.o
 driver-y += vx800_lpc.o
 driver-y += vx800_ide.o
 
diff --git a/src/southbridge/amd/cs5530/Makefile.inc b/src/southbridge/amd/cs5530/Makefile.inc
index 22024a0b6d..fa793f81b9 100644
--- a/src/southbridge/amd/cs5530/Makefile.inc
+++ b/src/southbridge/amd/cs5530/Makefile.inc
@@ -21,5 +21,5 @@
 driver-y += cs5530.o
 driver-y += cs5530_isa.o
 driver-y += cs5530_ide.o
-driver-$(CONFIG_VGA_ROM_RUN) += cs5530_vga.o
+driver-y += cs5530_vga.o
 driver-y += cs5530_pirq.o