diff options
| author | Alexandru Gagniuc <mr.nuke.me@gmail.com> | 2015-08-20 16:25:02 -0400 |
|---|---|---|
| committer | Alexandru Gagniuc <mr.nuke.me@gmail.com> | 2015-08-30 07:50:18 +0000 |
| commit | 4093148b260116ca8629ff9f7e335b4384247bd7 (patch) | |
| tree | e6494733bdae1aa2acfa141e859eccc4fea50e99 /src | |
| parent | cf1c94d1bf033396afb8605d79996a03d918a9d0 (diff) | |
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>
Diffstat (limited to 'src')
| -rw-r--r-- | src/device/Kconfig | 4 | ||||
| -rw-r--r-- | src/mainboard/google/cyan/Kconfig | 2 | ||||
| -rw-r--r-- | src/mainboard/google/rambi/Kconfig | 2 | ||||
| -rwxr-xr-x | src/mainboard/intel/strago/Kconfig | 2 | ||||
| -rw-r--r-- | src/soc/intel/broadwell/Kconfig | 2 | ||||
| -rw-r--r-- | src/soc/intel/skylake/Kconfig | 2 |
6 files changed, 2 insertions, 12 deletions
diff --git a/src/device/Kconfig b/src/device/Kconfig index d780d13491..39e612d047 100644 --- a/src/device/Kconfig +++ b/src/device/Kconfig @@ -51,7 +51,7 @@ config VGA_ROM_RUN bool "Run VGA Option ROMs" default n 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 Execute VGA Option ROMs in coreboot if found. This is required 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" default n if PAYLOAD_SEABIOS default y if !PAYLOAD_SEABIOS - depends on PCI && !PAYLOAD_SEABIOS || EXPERT + depends on PCI && EXPERT help Execute Option ROMs stored on PCI/PCIe/AGP devices in coreboot. diff --git a/src/mainboard/google/cyan/Kconfig b/src/mainboard/google/cyan/Kconfig index f3bb851a94..e4dc3224e6 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 diff --git a/src/mainboard/google/rambi/Kconfig b/src/mainboard/google/rambi/Kconfig index 1ad2d6d8ab..825df9afaa 100644 --- a/src/mainboard/google/rambi/Kconfig +++ b/src/mainboard/google/rambi/Kconfig @@ -11,8 +11,6 @@ config BOARD_SPECIFIC_OPTIONS select HAVE_ACPI_RESUME select MAINBOARD_HAS_CHROMEOS select MAINBOARD_HAS_LPC_TPM - select VGA_ROM_RUN if !PAYLOAD_SEABIOS - select ALWAYS_LOAD_OPROM if !PAYLOAD_SEABIOS config CHROMEOS select CHROMEOS_VBNV_CMOS diff --git a/src/mainboard/intel/strago/Kconfig b/src/mainboard/intel/strago/Kconfig index 1d4d4d82e6..1512a4661f 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 diff --git a/src/soc/intel/broadwell/Kconfig b/src/soc/intel/broadwell/Kconfig index 524366c56f..010625562a 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 f42d3abb42..9805b6dfc4 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 |