[coreboot-gerrit] Patch set updated for coreboot: dea6656 Kconfig: Allow native vga init to be selectable for SeaBIOS payload
Edward O'Callaghan (eocallaghan@alterapraxis.com)
gerrit at coreboot.org
Sat Sep 13 12:36:17 CEST 2014
Edward O'Callaghan (eocallaghan at alterapraxis.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6891
-gerrit
commit dea6656a90a2443ef3445f92cef8ad26ff81049d
Author: Edward O'Callaghan <eocallaghan at alterapraxis.com>
Date: Sat Sep 13 03:43:49 2014 +1000
Kconfig: Allow native vga init to be selectable for SeaBIOS payload
Change-Id: I1508f3d3c56cb9afbf4a23355831549552a62866
Signed-off-by: Edward O'Callaghan <eocallaghan at alterapraxis.com>
---
Makefile.inc | 4 ++++
payloads/external/SeaBIOS/Makefile.inc | 4 ++++
src/Kconfig | 16 ++++++++++++++++
src/arch/x86/Makefile.inc | 1 +
4 files changed, 25 insertions(+)
diff --git a/Makefile.inc b/Makefile.inc
index c41945a..882448f 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -532,6 +532,10 @@ ifneq ($(CONFIG_SEABIOS_PS2_TIMEOUT),0)
$(CBFSTOOL) $@.tmp add-int -i $(CONFIG_SEABIOS_PS2_TIMEOUT) -n etc/ps2-keyboard-spinup
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)
@printf " CONFIG $(DOTCONFIG)\n"
if [ -f $(DOTCONFIG) ]; then \
diff --git a/payloads/external/SeaBIOS/Makefile.inc b/payloads/external/SeaBIOS/Makefile.inc
index 21bc9a7..02c31e3 100644
--- a/payloads/external/SeaBIOS/Makefile.inc
+++ b/payloads/external/SeaBIOS/Makefile.inc
@@ -37,6 +37,10 @@ endif
ifneq ($(CONFIG_SEABIOS_THREAD_OPTIONROMS),y)
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
# This shows how to force a previously set .config option *off*
#echo "# CONFIG_SMBIOS is not set" >> seabios/.config
$(MAKE) -C seabios olddefconfig OUT=out/
diff --git a/src/Kconfig b/src/Kconfig
index 443732a..28f1181 100644
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -636,6 +636,17 @@ config SEABIOS_MALLOC_UPPERMEMORY
hardware. In general, if this is desired, the option will be
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
prompt "GRUB2 version"
default GRUB2_MASTER
@@ -683,6 +694,11 @@ config PAYLOAD_FILE
depends on PAYLOAD_SEABIOS
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
depends on PAYLOAD_FILO
default "payloads/external/FILO/filo/build/filo.elf"
diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc
index aa058c0..0a7399e 100644
--- a/src/arch/x86/Makefile.inc
+++ b/src/arch/x86/Makefile.inc
@@ -349,6 +349,7 @@ seabios:
CONFIG_SEABIOS_MASTER=$(CONFIG_SEABIOS_MASTER) \
CONFIG_SEABIOS_STABLE=$(CONFIG_SEABIOS_STABLE) \
CONFIG_SEABIOS_THREAD_OPTIONROMS=$(CONFIG_SEABIOS_THREAD_OPTIONROMS) \
+ CONFIG_SEABIOS_VGA_COREBOOT=$(CONFIG_SEABIOS_VGA_COREBOOT) \
CONFIG_CONSOLE_SERIAL=$(CONFIG_CONSOLE_SERIAL) \
CONFIG_TTYS0_BASE=$(CONFIG_TTYS0_BASE) \
CONFIG_SEABIOS_MALLOC_UPPERMEMORY=$(CONFIG_SEABIOS_MALLOC_UPPERMEMORY) \
More information about the coreboot-gerrit
mailing list