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> Reviewed-on: http://review.coreboot.org/11246 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin <adurbin@chromium.org>
This commit is contained in:
parent
1afcb23cd7
commit
b95fc308af
|
@ -2,7 +2,8 @@ if BOARD_GOOGLE_CYAN
|
||||||
|
|
||||||
config BOARD_SPECIFIC_OPTIONS
|
config BOARD_SPECIFIC_OPTIONS
|
||||||
def_bool y
|
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 BOARD_ROMSIZE_KB_8192
|
||||||
select CHROMEOS
|
select CHROMEOS
|
||||||
select CHROMEOS_VBNV_CMOS
|
select CHROMEOS_VBNV_CMOS
|
||||||
|
|
|
@ -13,7 +13,8 @@ config BOARD_SPECIFIC_OPTIONS
|
||||||
select HAVE_ACPI_RESUME
|
select HAVE_ACPI_RESUME
|
||||||
select MAINBOARD_HAS_CHROMEOS
|
select MAINBOARD_HAS_CHROMEOS
|
||||||
select MAINBOARD_HAS_LPC_TPM
|
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 CHROMEOS_VBNV_CMOS
|
||||||
select LID_SWITCH
|
select LID_SWITCH
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,8 @@ if BOARD_INTEL_STRAGO
|
||||||
|
|
||||||
config BOARD_SPECIFIC_OPTIONS
|
config BOARD_SPECIFIC_OPTIONS
|
||||||
def_bool y
|
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 BOARD_ROMSIZE_KB_8192
|
||||||
select CHROMEOS
|
select CHROMEOS
|
||||||
select CHROMEOS_VBNV_CMOS
|
select CHROMEOS_VBNV_CMOS
|
||||||
|
|
|
@ -11,7 +11,8 @@ config CPU_SPECIFIC_OPTIONS
|
||||||
select ARCH_VERSTAGE_X86_32
|
select ARCH_VERSTAGE_X86_32
|
||||||
select ARCH_ROMSTAGE_X86_32
|
select ARCH_ROMSTAGE_X86_32
|
||||||
select ARCH_RAMSTAGE_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 BACKUP_DEFAULT_SMM_REGION
|
||||||
select CACHE_MRC_BIN
|
select CACHE_MRC_BIN
|
||||||
select CACHE_MRC_SETTINGS
|
select CACHE_MRC_SETTINGS
|
||||||
|
|
|
@ -11,7 +11,8 @@ config CPU_SPECIFIC_OPTIONS
|
||||||
select ARCH_RAMSTAGE_X86_32
|
select ARCH_RAMSTAGE_X86_32
|
||||||
select ARCH_ROMSTAGE_X86_32
|
select ARCH_ROMSTAGE_X86_32
|
||||||
select ARCH_VERSTAGE_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 BACKUP_DEFAULT_SMM_REGION
|
||||||
select CACHE_MRC_SETTINGS
|
select CACHE_MRC_SETTINGS
|
||||||
select CACHE_RELOCATED_RAMSTAGE_OUTSIDE_CBMEM
|
select CACHE_RELOCATED_RAMSTAGE_OUTSIDE_CBMEM
|
||||||
|
|
Loading…
Reference in New Issue