Bruce Griffith (Bruce.Griffith@se-eng.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3528
-gerrit
commit 760f4b27802bf29d34c50f93320711c9c82132c9 Author: Bruce Griffith Bruce.Griffith@se-eng.com Date: Fri Jun 14 16:12:12 2013 -0600
SeaBIOS: Use coreboot video BIOS settings to set seabios settings
SeaBIOS needs to know what coreboot did with option ROMs to figure out what remains to be loaded and configured. With existing Kconfig and Makefile code, the load path is assumed even though there are coreboot settings that change the processing.
Change the SeaBIOS payload Makefile.inc file to set OPTIONROMS_DEPLOYED to match the VBIOS setting in coreboot. This requires a corresponding change in the arch Makefile.inc to pass the OPTIONROMS_DEPLOYED setting to SeaBIOS make.
One limitation of this implementation is that SeaBIOS make assumes that coreboot either set up all option ROMs, or none of them. So if SeaBIOS is used, then PCI_ROM_RUN and VGA_ROM_RUN should both be set or both be unset in coreboot. This change does not check for the condition where only one of the two is set.
Change-Id: I13a0b608869b0f980dfb369ffbfbac11b953fe13 Signed-off-by: Bruce Griffith Bruce.Griffith@se-eng.com --- payloads/external/SeaBIOS/Makefile.inc | 5 +++++ src/arch/x86/Makefile.inc | 2 ++ 2 files changed, 7 insertions(+)
diff --git a/payloads/external/SeaBIOS/Makefile.inc b/payloads/external/SeaBIOS/Makefile.inc index 022e012..a057d4c 100644 --- a/payloads/external/SeaBIOS/Makefile.inc +++ b/payloads/external/SeaBIOS/Makefile.inc @@ -25,6 +25,11 @@ config: checkout echo "CONFIG_COREBOOT=y" >> $(OUT)/seabios/.config echo "CONFIG_DEBUG_SERIAL=y" >> $(OUT)/seabios/.config echo "CONFIG_DEBUG_SERIAL_PORT=0x3f8" >> $(OUT)/seabios/.config +ifneq (,$(filter y,$(CONFIG_PCI_ROM_RUN) $(CONFIG_VGA_ROM_RUN))) + echo "CONFIG_OPTIONROMS_DEPLOYED=y" >> $(OUT)/seabios/.config +else + echo "# CONFIG_OPTIONROMS_DEPLOYED is not set" >> $(OUT)/seabios/.config +endif echo "CONFIG_COREBOOT_FLASH=y" >> $(OUT)/seabios/.config echo "CONFIG_LZMA=y" >> $(OUT)/seabios/.config echo "CONFIG_FLASH_FLOPPY=y" >> $(OUT)/seabios/.config diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc index 7f1b7b2..28b0ae9 100644 --- a/src/arch/x86/Makefile.inc +++ b/src/arch/x86/Makefile.inc @@ -408,6 +408,8 @@ seabios: OBJCOPY="$(OBJCOPY)" STRIP="$(STRIP)" \ CONFIG_SEABIOS_MASTER=$(CONFIG_SEABIOS_MASTER) \ CONFIG_SEABIOS_STABLE=$(CONFIG_SEABIOS_STABLE) \ + CONFIG_VGA_ROM_RUN=$(CONFIG_VGA_ROM_RUN) \ + CONFIG_PCI_ROM_RUN=$(CONFIG_PCI_ROM_RUN) \ OUT=$(abspath $(obj)) IASL="$(IASL)"
filo: