summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/mainboard/google/cyan/Kconfig3
-rw-r--r--src/mainboard/google/rambi/Kconfig3
-rwxr-xr-xsrc/mainboard/intel/strago/Kconfig3
-rw-r--r--src/soc/intel/broadwell/Kconfig3
-rw-r--r--src/soc/intel/skylake/Kconfig3
5 files changed, 10 insertions, 5 deletions
diff --git a/src/mainboard/google/cyan/Kconfig b/src/mainboard/google/cyan/Kconfig
index 988002c87f..91f7587f8c 100644
--- a/src/mainboard/google/cyan/Kconfig
+++ b/src/mainboard/google/cyan/Kconfig
@@ -2,7 +2,8 @@ if BOARD_GOOGLE_CYAN
config BOARD_SPECIFIC_OPTIONS
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 CHROMEOS
select CHROMEOS_VBNV_CMOS
diff --git a/src/mainboard/google/rambi/Kconfig b/src/mainboard/google/rambi/Kconfig
index 6fb19d47a3..45c3ecea22 100644
--- a/src/mainboard/google/rambi/Kconfig
+++ b/src/mainboard/google/rambi/Kconfig
@@ -13,7 +13,8 @@ config BOARD_SPECIFIC_OPTIONS
select HAVE_ACPI_RESUME
select MAINBOARD_HAS_CHROMEOS
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 LID_SWITCH
diff --git a/src/mainboard/intel/strago/Kconfig b/src/mainboard/intel/strago/Kconfig
index a7932e1923..c19761ac65 100755
--- a/src/mainboard/intel/strago/Kconfig
+++ b/src/mainboard/intel/strago/Kconfig
@@ -2,7 +2,8 @@ if BOARD_INTEL_STRAGO
config BOARD_SPECIFIC_OPTIONS
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 CHROMEOS
select CHROMEOS_VBNV_CMOS
diff --git a/src/soc/intel/broadwell/Kconfig b/src/soc/intel/broadwell/Kconfig
index 5da8a3354c..5853118268 100644
--- a/src/soc/intel/broadwell/Kconfig
+++ b/src/soc/intel/broadwell/Kconfig
@@ -11,7 +11,8 @@ config CPU_SPECIFIC_OPTIONS
select ARCH_VERSTAGE_X86_32
select ARCH_ROMSTAGE_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 CACHE_MRC_BIN
select CACHE_MRC_SETTINGS
diff --git a/src/soc/intel/skylake/Kconfig b/src/soc/intel/skylake/Kconfig
index 9d920d837d..f42d3abb42 100644
--- a/src/soc/intel/skylake/Kconfig
+++ b/src/soc/intel/skylake/Kconfig
@@ -11,7 +11,8 @@ config CPU_SPECIFIC_OPTIONS
select ARCH_RAMSTAGE_X86_32
select ARCH_ROMSTAGE_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 CACHE_MRC_SETTINGS
select CACHE_RELOCATED_RAMSTAGE_OUTSIDE_CBMEM