x86: Build vga video code only if CONFIG_VIDEO_VGA is defined

When running from coreboot we don't want this code, so make it
optional.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/README b/README
index c7aab18efade64faffe29066ad25b0d79794cbe0..0f5dfadcaf9a5a9548dbdefa8627decc21185d86 100644 (file)
--- a/README
+++ b/README
@@ -1409,6 +1409,13 @@ CBFS (Coreboot Filesystem) support
                boot.  See the documentation file README.video for a
                description of this variable.
 
+               CONFIG_VIDEO_VGA
+
+               Enable the VGA video / BIOS for x86. The alternative if you
+               are using coreboot is to use the coreboot frame buffer
+               driver.
+
+
 - Keyboard Support:
                CONFIG_KEYBOARD
 

diff --git a/arch/x86/lib/Makefile b/arch/x86/lib/Makefile
index 2a3e8f00cd65de3e45f81fbd8bcdb49883156a9d..0a52cc896c6b9c36b920f7d3fc91fdd3a2c17603 100644 (file)
--- a/arch/x86/lib/Makefile
+++ b/arch/x86/lib/Makefile
@@ -32,7 +32,7 @@ COBJS-y       += realmode.o
 SOBJS-y        += realmode_switch.o
 
 COBJS-$(CONFIG_SYS_PC_BIOS)    += bios_setup.o
-COBJS-$(CONFIG_VIDEO)  += video_bios.o
+COBJS-$(CONFIG_VIDEO_VGA)      += video_bios.o
 endif
 
 COBJS-y        += board.o
@@ -50,7 +50,7 @@ COBJS-y       += relocate.o
 COBJS-y += physmem.o
 COBJS-y        += string.o
 COBJS-$(CONFIG_SYS_X86_ISR_TIMER)      += timer.o
-COBJS-$(CONFIG_VIDEO)  += video.o
+COBJS-$(CONFIG_VIDEO_VGA)      += video.o
 COBJS-$(CONFIG_CMD_ZBOOT)      += zimage.o
 
 SRCS   := $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c)