New patch to review for coreboot: Fix Kconfig: ALWAYS_LOAD_OPROM has unmet dependency VGA_ROM_RUN
Martin Roth (martinroth@google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/11246
-gerrit
commit cf2245f2843a1eb5fe10ab7af25d595d294cb59f Author: Martin Roth martinroth@google.com Date: Mon Aug 17 11:29:01 2015 -0600
Fix Kconfig: ALWAYS_LOAD_OPROM has unmet dependency VGA_ROM_RUN
Broadwell and Skylake chipsets, along with a few mainboards were selecting ALWAYS_LOAD_OPROM without making sure that the dependency for that symbol was met as well.
Looking at the dependencies for VGA_RUN_ROM, we see: PCI && !PAYLOAD_SEABIOS && !MAINBOARD_DO_NATIVE_VGA_INIT
Since ARCH_X86 selects PCI, that's always met here. Since Broadwell and Skylake don't have native VGA init yet, that's not needed.
- Make sure that VGA_RUN_ROM is selected as well. - Add dependency on !PAYLOAD_SEABIOS for both ALWAYS_LOAD_OPROM and VGA_RUN_ROM symbols where they're selected.
Fixes Kconfig warning for these boards and chipsets: warning: (BOARD_SPECIFIC_OPTIONS && BOARD_SPECIFIC_OPTIONS && BOARD_SPECIFIC_OPTIONS && CPU_SPECIFIC_OPTIONS && CPU_SPECIFIC_OPTIONS) selects ALWAYS_LOAD_OPROM which has unmet direct dependencies (VGA_ROM_RUN)
Change-Id: I787a87e9467e1fc7afe8b04864b2a89b54824b9f Signed-off-by: Martin Roth martinroth@google.com --- src/mainboard/google/cyan/Kconfig | 3 ++- src/mainboard/google/rambi/Kconfig | 3 ++- src/mainboard/intel/strago/Kconfig | 3 ++- src/soc/intel/broadwell/Kconfig | 3 ++- src/soc/intel/skylake/Kconfig | 3 ++- 5 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/src/mainboard/google/cyan/Kconfig b/src/mainboard/google/cyan/Kconfig index 988002c..91f7587 100644 --- a/src/mainboard/google/cyan/Kconfig +++ b/src/mainboard/google/cyan/Kconfig @@ -2,7 +2,8 @@ if BOARD_GOOGLE_CYAN
config BOARD_SPECIFIC_OPTIONS def_bool y - select ALWAYS_LOAD_OPROM + select VGA_ROM_RUN if !PAYLOAD_SEABIOS + select ALWAYS_LOAD_OPROM if !PAYLOAD_SEABIOS select BOARD_ROMSIZE_KB_8192 select CHROMEOS select CHROMEOS_VBNV_CMOS diff --git a/src/mainboard/google/rambi/Kconfig b/src/mainboard/google/rambi/Kconfig index 6fb19d4..45c3ece 100644 --- a/src/mainboard/google/rambi/Kconfig +++ b/src/mainboard/google/rambi/Kconfig @@ -13,7 +13,8 @@ config BOARD_SPECIFIC_OPTIONS select HAVE_ACPI_RESUME select MAINBOARD_HAS_CHROMEOS select MAINBOARD_HAS_LPC_TPM - select ALWAYS_LOAD_OPROM + select VGA_ROM_RUN if !PAYLOAD_SEABIOS + select ALWAYS_LOAD_OPROM if !PAYLOAD_SEABIOS select CHROMEOS_VBNV_CMOS select LID_SWITCH
diff --git a/src/mainboard/intel/strago/Kconfig b/src/mainboard/intel/strago/Kconfig index a7932e1..c19761a 100755 --- a/src/mainboard/intel/strago/Kconfig +++ b/src/mainboard/intel/strago/Kconfig @@ -2,7 +2,8 @@ if BOARD_INTEL_STRAGO
config BOARD_SPECIFIC_OPTIONS def_bool y - select ALWAYS_LOAD_OPROM + select VGA_ROM_RUN if !PAYLOAD_SEABIOS + select ALWAYS_LOAD_OPROM if !PAYLOAD_SEABIOS select BOARD_ROMSIZE_KB_8192 select CHROMEOS select CHROMEOS_VBNV_CMOS diff --git a/src/soc/intel/broadwell/Kconfig b/src/soc/intel/broadwell/Kconfig index 5da8a33..5853118 100644 --- a/src/soc/intel/broadwell/Kconfig +++ b/src/soc/intel/broadwell/Kconfig @@ -11,7 +11,8 @@ config CPU_SPECIFIC_OPTIONS select ARCH_VERSTAGE_X86_32 select ARCH_ROMSTAGE_X86_32 select ARCH_RAMSTAGE_X86_32 - select ALWAYS_LOAD_OPROM + select VGA_ROM_RUN if !PAYLOAD_SEABIOS + select ALWAYS_LOAD_OPROM if !PAYLOAD_SEABIOS select BACKUP_DEFAULT_SMM_REGION select CACHE_MRC_BIN select CACHE_MRC_SETTINGS diff --git a/src/soc/intel/skylake/Kconfig b/src/soc/intel/skylake/Kconfig index 6c64cd9..b6d55fd 100644 --- a/src/soc/intel/skylake/Kconfig +++ b/src/soc/intel/skylake/Kconfig @@ -11,7 +11,8 @@ config CPU_SPECIFIC_OPTIONS select ARCH_RAMSTAGE_X86_32 select ARCH_ROMSTAGE_X86_32 select ARCH_VERSTAGE_X86_32 - select ALWAYS_LOAD_OPROM + 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