New patch to review for coreboot: Update VGA_ROM_RUN & ALWAYS_LOAD_OPROM Kconfig symbols
Martin Roth (martinroth@google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/11366
-gerrit
commit 049bac56fccff2b64b7a58a0d62634ce4d0b0e7d Author: Martin Roth martinroth@google.com Date: Wed Aug 26 13:00:38 2015 -0600
Update VGA_ROM_RUN & ALWAYS_LOAD_OPROM Kconfig symbols
- Add a prompt for ALWAYS_LOAD_OPROM so it can be enabled / disabled in the Kconfig front-end.
- Change the selects of VGA_ROM_RUN & ALWAYS_LOAD_OPROM for the broadwell and skylake SOC mainboards to configs, defaulted to enabled. This allows the options to be turned off, and removes the explicit dependency on !PAYLOAD_SEABIOS. For Skylake, only set these if the system isn't using GOP.
- Remove the SOC configuration of VGA_ROM_RUN & ALWAYS_LOAD_OPROM. These should only be set by the mainboard.
Change-Id: I52c41a10dcf883d6cecaa83a47c4fce6d8f2f288 Signed-off-by: Martin Roth martinroth@google.com --- src/device/Kconfig | 3 ++- src/mainboard/google/cyan/Kconfig | 11 ++++++++--- src/mainboard/google/rambi/Kconfig | 6 ++++++ src/mainboard/intel/strago/Kconfig | 13 ++++++++++--- src/soc/intel/broadwell/Kconfig | 2 -- src/soc/intel/skylake/Kconfig | 2 -- 6 files changed, 26 insertions(+), 11 deletions(-)
diff --git a/src/device/Kconfig b/src/device/Kconfig index d780d13..b2db243 100644 --- a/src/device/Kconfig +++ b/src/device/Kconfig @@ -77,7 +77,8 @@ config S3_VGA_ROM_RUN If unsure, say N when using SeaBIOS as payload, Y otherwise.
config ALWAYS_LOAD_OPROM - def_bool n + bool "Always load discovered option ROMs" + default n depends on VGA_ROM_RUN help Always load option ROMs if any are found. The decision to run diff --git a/src/mainboard/google/cyan/Kconfig b/src/mainboard/google/cyan/Kconfig index f3bb851..362d423 100644 --- a/src/mainboard/google/cyan/Kconfig +++ b/src/mainboard/google/cyan/Kconfig @@ -2,8 +2,6 @@ if BOARD_GOOGLE_CYAN
config BOARD_SPECIFIC_OPTIONS def_bool y - select VGA_ROM_RUN if !PAYLOAD_SEABIOS - select ALWAYS_LOAD_OPROM if !PAYLOAD_SEABIOS select BOARD_ROMSIZE_KB_8192 select EC_GOOGLE_CHROMEEC select EC_GOOGLE_CHROMEEC_MEC @@ -69,6 +67,13 @@ config VGA_BIOS_ID string default "8086,22b1" if C0_DISP_SUPPORT default "8086,22b0" if !C0_DISP_SUPPORT -endif + +config VGA_ROM_RUN + def_bool y + +config ALWAYS_LOAD_OPROM + def_bool y + +endif # !CONFIG_GOP_SUPPORT
endif # BOARD_GOOGLE_CYAN diff --git a/src/mainboard/google/rambi/Kconfig b/src/mainboard/google/rambi/Kconfig index 1ad2d6d..d6eff50 100644 --- a/src/mainboard/google/rambi/Kconfig +++ b/src/mainboard/google/rambi/Kconfig @@ -40,4 +40,10 @@ config HAVE_ME_BIN bool default n
+config VGA_ROM_RUN + def_bool y + +config ALWAYS_LOAD_OPROM + def_bool y + endif # BOARD_INTEL_BAYLEYBAY diff --git a/src/mainboard/intel/strago/Kconfig b/src/mainboard/intel/strago/Kconfig index 1d4d4d8..36d54d2 100755 --- a/src/mainboard/intel/strago/Kconfig +++ b/src/mainboard/intel/strago/Kconfig @@ -2,8 +2,6 @@ if BOARD_INTEL_STRAGO
config BOARD_SPECIFIC_OPTIONS def_bool y - select VGA_ROM_RUN if !PAYLOAD_SEABIOS - select ALWAYS_LOAD_OPROM if !PAYLOAD_SEABIOS select BOARD_ROMSIZE_KB_8192 select EC_GOOGLE_CHROMEEC select EC_GOOGLE_CHROMEEC_MEC @@ -55,6 +53,7 @@ config VBOOT_RAMSTAGE_INDEX config VBOOT_REFCODE_INDEX hex default 0x3 + if !CONFIG_GOP_SUPPORT config VGA_BIOS_FILE string @@ -64,5 +63,13 @@ config VGA_BIOS_ID string default "8086,22b1" if C0_DISP_SUPPORT default "8086,22b0" if !C0_DISP_SUPPORT -endif + +config VGA_ROM_RUN + def_bool y + +config ALWAYS_LOAD_OPROM + def_bool y + +endif #!CONFIG_GOP_SUPPORT + endif # BOARD_INTEL_STRAGO diff --git a/src/soc/intel/broadwell/Kconfig b/src/soc/intel/broadwell/Kconfig index 524366c..0106255 100644 --- a/src/soc/intel/broadwell/Kconfig +++ b/src/soc/intel/broadwell/Kconfig @@ -11,8 +11,6 @@ config CPU_SPECIFIC_OPTIONS select ARCH_VERSTAGE_X86_32 select ARCH_ROMSTAGE_X86_32 select ARCH_RAMSTAGE_X86_32 - select VGA_ROM_RUN if !PAYLOAD_SEABIOS - select ALWAYS_LOAD_OPROM if !PAYLOAD_SEABIOS select BACKUP_DEFAULT_SMM_REGION select CACHE_MRC_SETTINGS select MRC_SETTINGS_PROTECT diff --git a/src/soc/intel/skylake/Kconfig b/src/soc/intel/skylake/Kconfig index f42d3ab..9805b6d 100644 --- a/src/soc/intel/skylake/Kconfig +++ b/src/soc/intel/skylake/Kconfig @@ -11,8 +11,6 @@ config CPU_SPECIFIC_OPTIONS select ARCH_RAMSTAGE_X86_32 select ARCH_ROMSTAGE_X86_32 select ARCH_VERSTAGE_X86_32 - select VGA_ROM_RUN if !PAYLOAD_SEABIOS - select ALWAYS_LOAD_OPROM if !PAYLOAD_SEABIOS select BACKUP_DEFAULT_SMM_REGION select CACHE_MRC_SETTINGS select CACHE_RELOCATED_RAMSTAGE_OUTSIDE_CBMEM
-
Martin Roth