From: Simon Glass <sjg@chromium.org>
Date: Mon, 3 Dec 2012 13:59:47 +0000 (+0000)
Subject: x86: Build vga video code only if CONFIG_VIDEO_VGA is defined
X-Git-Tag: v2013.01-rc2~73^2~3
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=058d59b08ddcc6fd3b59210a4605721cc96ead44;p=u-boot

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 c7aab18efa..0f5dfadcaf 100644
--- 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 2a3e8f00cd..0a52cc896c 100644
--- 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)