[coreboot-gerrit] New patch to review for coreboot: Kconfig: Don't 'select' options based on PAYLOAD_SEABIOS

Alexandru Gagniuc (mr.nuke.me@gmail.com) gerrit at coreboot.org
Thu Aug 20 22:28:36 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 7823e638a357a1c9f4c430c02b766b1e1d76f93c
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.
    
    Maybe we sould rename this to DEFAULT_PAYLOAD_SEABIOS or something
    that's clear that the payload is NOT guaranteed to be SeaBIOS
    
    Change-Id: I4c17e8dde20bf21537f542fda2dad7d3a1894862
    Signed-off-by: Alexandru Gagniuc <mr.nuke.me at gmail.com>
---
 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 --
 5 files changed, 10 deletions(-)

diff --git a/src/mainboard/google/cyan/Kconfig b/src/mainboard/google/cyan/Kconfig
index 094c629..f45eb27 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 CHROMEOS_VBNV_CMOS
 	select EC_GOOGLE_CHROMEEC
diff --git a/src/mainboard/google/rambi/Kconfig b/src/mainboard/google/rambi/Kconfig
index 45c3ece..bb8b7f6 100644
--- a/src/mainboard/google/rambi/Kconfig
+++ b/src/mainboard/google/rambi/Kconfig
@@ -13,8 +13,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
 	select CHROMEOS_VBNV_CMOS
 	select LID_SWITCH
 
diff --git a/src/mainboard/intel/strago/Kconfig b/src/mainboard/intel/strago/Kconfig
index 599a84a..f69d610 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 CHROMEOS_VBNV_CMOS
 	select EC_GOOGLE_CHROMEEC
diff --git a/src/soc/intel/broadwell/Kconfig b/src/soc/intel/broadwell/Kconfig
index 5853118..d16cb00 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_BIN
 	select CACHE_MRC_SETTINGS
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