summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2012-12-03 13:59:47 +0000
committerSimon Glass <sjg@chromium.org>2012-12-06 14:30:44 -0800
commit058d59b08ddcc6fd3b59210a4605721cc96ead44 (patch)
tree198d005791ed14ef0ddd80abb28e5ad2090c555e
parenta94e9d70e3c6008f4d233bf5613c30f874c3f092 (diff)
downloadu-boot-imx-058d59b08ddcc6fd3b59210a4605721cc96ead44.zip
u-boot-imx-058d59b08ddcc6fd3b59210a4605721cc96ead44.tar.gz
u-boot-imx-058d59b08ddcc6fd3b59210a4605721cc96ead44.tar.bz2
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>
-rw-r--r--README7
-rw-r--r--arch/x86/lib/Makefile4
2 files changed, 9 insertions, 2 deletions
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)