Patchwork [U-Boot,v2,20/21] x86: Build vga video code only if CONFIG_VIDEO_VGA is defined

login
register
mail settings
Submitter Simon Glass
Date Dec. 3, 2012, 11:59 p.m.
Message ID <1354579187-2469-1-git-send-email-sjg@chromium.org>
Download mbox | patch
Permalink /patch/203507/
State Accepted, archived
Delegated to: Simon Glass
Headers show

Comments

Simon Glass - Dec. 3, 2012, 11:59 p.m.
When running from coreboot we don't want this code, so make it
optional.

Signed-off-by: Simon Glass <sjg@chromium.org>
---
Changes in v2:
- Add new patch to remove video code, to avoid compile error

 README                |    7 +++++++
 arch/x86/lib/Makefile |    4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

Patch

diff --git a/README b/README
index c7aab18..0f5dfad 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 2a3e8f0..0a52cc8 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)