GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-28 01:51:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

x86: Build vga video code only if CONFIG_VIDEO_VGA is defined

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

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2012-12-03 13:59:47 +00:00
parent a94e9d70e3
commit 058d59b08d
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
README
View file

@ -1409,6 +1409,13 @@ CBFS (Coreboot Filesystem) support
boot. See the documentation file README.video for a boot. See the documentation file README.video for a
description of this variable. 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: - Keyboard Support:
CONFIG_KEYBOARD CONFIG_KEYBOARD

4
arch/x86/lib/Makefile
View file

@ -32,7 +32,7 @@ COBJS-y += realmode.o
SOBJS-y += realmode_switch.o SOBJS-y += realmode_switch.o
COBJS-$(CONFIG_SYS_PC_BIOS) += bios_setup.o COBJS-$(CONFIG_SYS_PC_BIOS) += bios_setup.o
COBJS-$(CONFIG_VIDEO) += video_bios.o COBJS-$(CONFIG_VIDEO_VGA) += video_bios.o
endif endif
COBJS-y += board.o COBJS-y += board.o
@ -50,7 +50,7 @@ COBJS-y += relocate.o
COBJS-y += physmem.o COBJS-y += physmem.o
COBJS-y += string.o COBJS-y += string.o
COBJS-$(CONFIG_SYS_X86_ISR_TIMER) += timer.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 COBJS-$(CONFIG_CMD_ZBOOT) += zimage.o
SRCS := $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c) SRCS := $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c)