GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Kconfig: Don't 'select' options based on PAYLOAD_SEABIOS 

This is just wrong. PAYLOAD_SEABIOS tells us nothing about whether
or not the payload will actually be SeaBIOS:
1. PAYLOAD_SEABIOS, but payload changed with cbfstool
2. !PAYLOAD_SEABIOS, but an elf payload was added which is SeaBIOS
et. cetera.

Change-Id: I4c17e8dde20bf21537f542fda2dad7d3a1894862
Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
Reviewed-on: http://review.coreboot.org/11293
Tested-by: build bot (Jenkins)
Reviewed-by: Alexander Couzens <lynxis@fe80.eu>
Reviewed-by: Damien Zammit <damien@zamaudio.com>
This commit is contained in:
Alexandru Gagniuc 2015-08-20 16:25:02 -04:00
parent cf1c94d1bf
commit 4093148b26
6 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/device/Kconfig
View File

@ -51,7 +51,7 @@ config VGA_ROM_RUN
bool "Run VGA Option ROMs" bool "Run VGA Option ROMs"
default n if PAYLOAD_SEABIOS default n if PAYLOAD_SEABIOS
default y if !PAYLOAD_SEABIOS default y if !PAYLOAD_SEABIOS
depends on PCI && !PAYLOAD_SEABIOS && !MAINBOARD_DO_NATIVE_VGA_INIT || EXPERT depends on PCI && !MAINBOARD_DO_NATIVE_VGA_INIT && EXPERT
help help
Execute VGA Option ROMs in coreboot if found. This is required Execute VGA Option ROMs in coreboot if found. This is required
to enable PCI/AGP/PCI-E video cards when not using a SeaBIOS to enable PCI/AGP/PCI-E video cards when not using a SeaBIOS
@ -92,7 +92,7 @@ config ON_DEVICE_ROM_RUN
bool "Run Option ROMs on PCI devices" bool "Run Option ROMs on PCI devices"
default n if PAYLOAD_SEABIOS default n if PAYLOAD_SEABIOS
default y if !PAYLOAD_SEABIOS default y if !PAYLOAD_SEABIOS
depends on PCI && !PAYLOAD_SEABIOS || EXPERT depends on PCI && EXPERT
help help
Execute Option ROMs stored on PCI/PCIe/AGP devices in coreboot. Execute Option ROMs stored on PCI/PCIe/AGP devices in coreboot.

2
src/mainboard/google/cyan/Kconfig
View File

@ -2,8 +2,6 @@ if BOARD_GOOGLE_CYAN
config BOARD_SPECIFIC_OPTIONS config BOARD_SPECIFIC_OPTIONS
def_bool y def_bool y
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 EC_GOOGLE_CHROMEEC select EC_GOOGLE_CHROMEEC
select EC_GOOGLE_CHROMEEC_MEC select EC_GOOGLE_CHROMEEC_MEC

2
src/mainboard/google/rambi/Kconfig
View File

@ -11,8 +11,6 @@ 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 VGA_ROM_RUN if !PAYLOAD_SEABIOS
select ALWAYS_LOAD_OPROM if !PAYLOAD_SEABIOS
config CHROMEOS config CHROMEOS
select CHROMEOS_VBNV_CMOS select CHROMEOS_VBNV_CMOS

2
src/mainboard/intel/strago/Kconfig
View File

@ -2,8 +2,6 @@ if BOARD_INTEL_STRAGO
config BOARD_SPECIFIC_OPTIONS config BOARD_SPECIFIC_OPTIONS
def_bool y def_bool y
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 EC_GOOGLE_CHROMEEC select EC_GOOGLE_CHROMEEC
select EC_GOOGLE_CHROMEEC_MEC select EC_GOOGLE_CHROMEEC_MEC

2
src/soc/intel/broadwell/Kconfig
View File

@ -11,8 +11,6 @@ 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 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 MRC_SETTINGS_PROTECT select MRC_SETTINGS_PROTECT

2
src/soc/intel/skylake/Kconfig
View File

@ -11,8 +11,6 @@ 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 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