GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Kconfig: Allow native vga init to be selectable for SeaBIOS payload 

Change-Id: I1508f3d3c56cb9afbf4a23355831549552a62866
Signed-off-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
Reviewed-on: http://review.coreboot.org/6891
Tested-by: build bot (Jenkins)
Reviewed-by: Kevin O'Connor <kevin@koconnor.net>
Reviewed-by: Martin Roth <gaumless@gmail.com>
This commit is contained in:
Edward O'Callaghan 2014-09-13 03:43:49 +10:00
parent d63b97f9ab
commit a296f9e3d3
4 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.inc
View File

@ -531,6 +531,10 @@ ifneq ($(CONFIG_SEABIOS_PS2_TIMEOUT),0)
$(CBFSTOOL) $@.tmp add-int -i $(CONFIG_SEABIOS_PS2_TIMEOUT) -n etc/ps2-keyboard-spinup $(CBFSTOOL) $@.tmp add-int -i $(CONFIG_SEABIOS_PS2_TIMEOUT) -n etc/ps2-keyboard-spinup
endif endif
endif endif
ifeq ($(CONFIG_SEABIOS_VGA_COREBOOT),y)
@printf " SeaBIOS Adding generated legacy VGA option rom.\n"
$(CBFSTOOL) $@.tmp add -f $(CONFIG_PAYLOAD_VGABIOS_FILE) -n vgaroms/seavgabios.bin -t raw
endif
ifeq ($(CONFIG_INCLUDE_CONFIG_FILE),y) ifeq ($(CONFIG_INCLUDE_CONFIG_FILE),y)
@printf " CONFIG $(DOTCONFIG)\n" @printf " CONFIG $(DOTCONFIG)\n"
if [ -f $(DOTCONFIG) ]; then \ if [ -f $(DOTCONFIG) ]; then \

4
payloads/external/SeaBIOS/Makefile.inc vendored
View File

@ -36,6 +36,10 @@ ifneq ($(CONFIG_SEABIOS_MALLOC_UPPERMEMORY),y)
endif endif
ifneq ($(CONFIG_SEABIOS_THREAD_OPTIONROMS),y) ifneq ($(CONFIG_SEABIOS_THREAD_OPTIONROMS),y)
echo "# CONFIG_THREAD_OPTIONROMS is not set" >> seabios/.config echo "# CONFIG_THREAD_OPTIONROMS is not set" >> seabios/.config
endif
ifeq ($(CONFIG_SEABIOS_VGA_COREBOOT),y)
echo "CONFIG_VGA_COREBOOT=y" >> seabios/.config
echo "CONFIG_BUILD_VGABIOS=y" >> seabios/.config
endif endif
# This shows how to force a previously set .config option *off* # This shows how to force a previously set .config option *off*
#echo "# CONFIG_SMBIOS is not set" >> seabios/.config #echo "# CONFIG_SMBIOS is not set" >> seabios/.config

16
src/Kconfig
View File

@ -642,6 +642,17 @@ config SEABIOS_MALLOC_UPPERMEMORY
hardware. In general, if this is desired, the option will be hardware. In general, if this is desired, the option will be
set to 'N' by the chipset Kconfig. set to 'N' by the chipset Kconfig.
config SEABIOS_VGA_COREBOOT
prompt "Include generated option rom that implements legacy VGA BIOS compatibility" if PAYLOAD_SEABIOS
default n
depends on !VGA_BIOS && MAINBOARD_DO_NATIVE_VGA_INIT
bool
help
Coreboot can initialize the GPU of some mainboards.
After initializing the GPU, the information about it can be passed to the payload.
Provide an option rom that implements this legacy VGA BIOS compatibility requirement.
choice choice
prompt "GRUB2 version" prompt "GRUB2 version"
default GRUB2_MASTER default GRUB2_MASTER
@ -689,6 +700,11 @@ config PAYLOAD_FILE
depends on PAYLOAD_SEABIOS depends on PAYLOAD_SEABIOS
default "payloads/external/SeaBIOS/seabios/out/bios.bin.elf" default "payloads/external/SeaBIOS/seabios/out/bios.bin.elf"
config PAYLOAD_VGABIOS_FILE
string
depends on PAYLOAD_SEABIOS && SEABIOS_VGA_COREBOOT
default "payloads/external/SeaBIOS/seabios/out/vgabios.bin"
config PAYLOAD_FILE config PAYLOAD_FILE
depends on PAYLOAD_FILO depends on PAYLOAD_FILO
default "payloads/external/FILO/filo/build/filo.elf" default "payloads/external/FILO/filo/build/filo.elf"

1
src/arch/x86/Makefile.inc
View File

@ -349,6 +349,7 @@ seabios:
CONFIG_SEABIOS_MASTER=$(CONFIG_SEABIOS_MASTER) \ CONFIG_SEABIOS_MASTER=$(CONFIG_SEABIOS_MASTER) \
CONFIG_SEABIOS_STABLE=$(CONFIG_SEABIOS_STABLE) \ CONFIG_SEABIOS_STABLE=$(CONFIG_SEABIOS_STABLE) \
CONFIG_SEABIOS_THREAD_OPTIONROMS=$(CONFIG_SEABIOS_THREAD_OPTIONROMS) \ CONFIG_SEABIOS_THREAD_OPTIONROMS=$(CONFIG_SEABIOS_THREAD_OPTIONROMS) \
CONFIG_SEABIOS_VGA_COREBOOT=$(CONFIG_SEABIOS_VGA_COREBOOT) \
CONFIG_CONSOLE_SERIAL=$(CONFIG_CONSOLE_SERIAL) \ CONFIG_CONSOLE_SERIAL=$(CONFIG_CONSOLE_SERIAL) \
CONFIG_TTYS0_BASE=$(CONFIG_TTYS0_BASE) \ CONFIG_TTYS0_BASE=$(CONFIG_TTYS0_BASE) \
CONFIG_SEABIOS_MALLOC_UPPERMEMORY=$(CONFIG_SEABIOS_MALLOC_UPPERMEMORY) \ CONFIG_SEABIOS_MALLOC_UPPERMEMORY=$(CONFIG_SEABIOS_MALLOC_UPPERMEMORY) \