[coreboot-gerrit] Patch set updated for coreboot: Kconfig: Don't 'select' options based on PAYLOAD_SEABIOS
Alexandru Gagniuc (mr.nuke.me@gmail.com)
gerrit at coreboot.org
Thu Aug 27 07:17:34 CEST 2015
Alexandru Gagniuc (mr.nuke.me at gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/11293
-gerrit
commit 01c0deee35e941d57d22529b09e4f6565e4db66a
Author: Alexandru Gagniuc <mr.nuke.me at gmail.com>
Date: Thu Aug 20 16:25:02 2015 -0400
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 at gmail.com>
---
src/device/Kconfig | 4 ++--
src/mainboard/google/cyan/Kconfig | 2 --
src/mainboard/google/rambi/Kconfig | 2 --
src/mainboard/intel/strago/Kconfig | 2 --
src/soc/intel/broadwell/Kconfig | 2 --
src/soc/intel/skylake/Kconfig | 2 --
6 files changed, 2 insertions(+), 12 deletions(-)
diff --git a/src/device/Kconfig b/src/device/Kconfig
index d780d13..39e612d 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 f3bb851..e4dc322 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 1ad2d6d..825df9a 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 1d4d4d8..1512a46 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 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
More information about the coreboot-gerrit
mailing list