summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMyles Watson <mylesgw@gmail.com>2010-08-02 15:14:13 +0000
committerMyles Watson <mylesgw@gmail.com>2010-08-02 15:14:13 +0000
commit2d7ff69a036c9878976f983a6f4de37575e87fc4 (patch)
treee458bd62d5f4ecb38e33d10fd1b20c84f20790f2
parent25bf69a6c9eb4871bcff7d5dc3116f9d076ab545 (diff)
Build VGA code conditionally to avoid errors when using SeaBIOS.
Signed-off-by: Myles Watson <mylesgw@gmail.com> Acked-by: Kevin O'Connor <kevin@koconnor.net> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5680 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
-rw-r--r--src/northbridge/intel/i82830/Makefile.inc2
-rw-r--r--src/northbridge/via/cn400/Makefile.inc2
-rw-r--r--src/northbridge/via/cn700/Makefile.inc2
-rw-r--r--src/northbridge/via/cx700/Makefile.inc2
-rw-r--r--src/northbridge/via/vt8623/Makefile.inc2
-rw-r--r--src/northbridge/via/vx800/Makefile.inc2
-rw-r--r--src/southbridge/amd/cs5530/Makefile.inc2
7 files changed, 7 insertions, 7 deletions
diff --git a/src/northbridge/intel/i82830/Makefile.inc b/src/northbridge/intel/i82830/Makefile.inc
index 57dedfde73..85a2b0c1bb 100644
--- a/src/northbridge/intel/i82830/Makefile.inc
+++ b/src/northbridge/intel/i82830/Makefile.inc
@@ -1,4 +1,4 @@
driver-y += northbridge.o
-driver-y += vga.o
+driver-$(CONFIG_VGA_ROM_RUN) += 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 89bff39862..37f8e4f2ef 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-y += vga.o
+driver-$(CONFIG_VGA_ROM_RUN) += vga.o
driver-y += vlink.o
diff --git a/src/northbridge/via/cn700/Makefile.inc b/src/northbridge/via/cn700/Makefile.inc
index c0aa7b9e43..f5be8ac74e 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-y += vga.o
+driver-$(CONFIG_VGA_ROM_RUN) += vga.o
diff --git a/src/northbridge/via/cx700/Makefile.inc b/src/northbridge/via/cx700/Makefile.inc
index 1221fd5f8b..9b7a42c57e 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-y += cx700_vga.o
+driver-$(CONFIG_VGA_ROM_RUN) += cx700_vga.o
diff --git a/src/northbridge/via/vt8623/Makefile.inc b/src/northbridge/via/vt8623/Makefile.inc
index 47682ad13d..13cbc723c1 100644
--- a/src/northbridge/via/vt8623/Makefile.inc
+++ b/src/northbridge/via/vt8623/Makefile.inc
@@ -19,5 +19,5 @@
##
driver-y += northbridge.o
-driver-y += vga.o
+driver-$(CONFIG_VGA_ROM_RUN) += vga.o
diff --git a/src/northbridge/via/vx800/Makefile.inc b/src/northbridge/via/vx800/Makefile.inc
index c44266d0c3..f46a58f8e6 100644
--- a/src/northbridge/via/vx800/Makefile.inc
+++ b/src/northbridge/via/vx800/Makefile.inc
@@ -19,7 +19,7 @@
##
driver-y += northbridge.o
-driver-y += vga.o
+driver-$(CONFIG_VGA_ROM_RUN) += 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 fa793f81b9..22024a0b6d 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-y += cs5530_vga.o
+driver-$(CONFIG_VGA_ROM_RUN) += cs5530_vga.o
driver-y += cs5530_pirq.o