ChromeOS: Fix Kconfig dependencies
Add CHROMEOS dependencies to selects for the following Kconfig
symbols:
CHROMEOS_RAMOOPS_DYNAMIC
CHROMEOS_RAMOOPS_NON_ACPI
CHROMEOS_VBNV_CMOS
CHROMEOS_VBNV_EC
CHROMEOS_VBNV_FLASH
EC_SOFTWARE_SYNC
LID_SWITCH
RETURN_FROM_VERSTAGE
SEPARATE_VERSTAGE
VBOOT_DISABLE_DEV_ON_RECOVERY
VBOOT_EC_SLOW_UPDATE
VBOOT_OPROM_MATTERS
VBOOT_STARTS_IN_BOOTBLOCK
WIPEOUT_SUPPORTED
This gets rid of these sorts of Kconfig errors:
warning: BOARD_SPECIFIC_OPTIONS selects CHROMEOS_VBNV_EC which has
unmet direct dependencies (MAINBOARD_HAS_CHROMEOS && CHROMEOS)
Note: These two boards would never actually have CHROMEOS enabled:
intel/emeraldlake2 has MAINBOARD_HAS_CHROMEOS commented out
google/peach_pit doesn't have MAINBOARD_HAS_CHROMEOS
Change-Id: I51b4ee326f082c6a656a813ee5772e9c34f5c343
Signed-off-by: Martin Roth <martinroth@google.com>
Reviewed-on: http://review.coreboot.org/11272
Tested-by: build bot (Jenkins)
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
diff --git a/src/mainboard/google/auron/Kconfig b/src/mainboard/google/auron/Kconfig
index 3a4cb7e..7ad3eaa 100644
--- a/src/mainboard/google/auron/Kconfig
+++ b/src/mainboard/google/auron/Kconfig
@@ -5,7 +5,6 @@
select SOC_INTEL_BROADWELL
select BOARD_ROMSIZE_KB_8192
select EC_GOOGLE_CHROMEEC
- select EC_SOFTWARE_SYNC
select VIRTUAL_DEV_SWITCH
select HAVE_ACPI_TABLES
select HAVE_OPTION_TABLE
@@ -14,10 +13,13 @@
select HAVE_SMI_HANDLER
select MAINBOARD_HAS_CHROMEOS
select MAINBOARD_HAS_LPC_TPM
- select CHROMEOS_RAMOOPS_DYNAMIC
select INTEL_INT15
+
+config CHROMEOS
select CHROMEOS_VBNV_CMOS
select LID_SWITCH
+ select CHROMEOS_RAMOOPS_DYNAMIC
+ select EC_SOFTWARE_SYNC
config VBOOT_RAMSTAGE_INDEX
hex
diff --git a/src/mainboard/google/bolt/Kconfig b/src/mainboard/google/bolt/Kconfig
index 2e37e25..0599d15 100644
--- a/src/mainboard/google/bolt/Kconfig
+++ b/src/mainboard/google/bolt/Kconfig
@@ -8,7 +8,6 @@
select INTEL_LYNXPOINT_LP
select BOARD_ROMSIZE_KB_8192
select EC_GOOGLE_CHROMEEC
- select EC_SOFTWARE_SYNC
select VIRTUAL_DEV_SWITCH
select HAVE_ACPI_TABLES
select HAVE_OPTION_TABLE
@@ -18,8 +17,11 @@
select MAINBOARD_HAS_CHROMEOS
select MAINBOARD_HAS_LPC_TPM
select INTEL_INT15
+
+config CHROMEOS
select CHROMEOS_VBNV_CMOS
select LID_SWITCH
+ select EC_SOFTWARE_SYNC
config MAINBOARD_DIR
string
diff --git a/src/mainboard/google/butterfly/Kconfig b/src/mainboard/google/butterfly/Kconfig
index b1a64ee..0c37565 100644
--- a/src/mainboard/google/butterfly/Kconfig
+++ b/src/mainboard/google/butterfly/Kconfig
@@ -15,10 +15,10 @@
select MAINBOARD_HAS_CHROMEOS
select MAINBOARD_HAS_LPC_TPM
select INTEL_INT15
- select CHROMEOS_VBNV_CMOS
+ select SERIRQ_CONTINUOUS_MODE # Workaround for EC/KBC IRQ1.
- # Workaround for EC/KBC IRQ1.
- select SERIRQ_CONTINUOUS_MODE
+config CHROMEOS
+ select CHROMEOS_VBNV_CMOS
config MAINBOARD_DIR
string
diff --git a/src/mainboard/google/cosmos/Kconfig b/src/mainboard/google/cosmos/Kconfig
index a6c87b1..70a5e09 100644
--- a/src/mainboard/google/cosmos/Kconfig
+++ b/src/mainboard/google/cosmos/Kconfig
@@ -23,7 +23,6 @@
def_bool y
select BOARD_ID_AUTO
select BOARD_ROMSIZE_KB_2048
- select CHROMEOS_VBNV_FLASH
select COMMON_CBFS_SPI_WRAPPER
select HAVE_HARD_RESET
select MAINBOARD_HAS_CHROMEOS
@@ -31,6 +30,9 @@
select SPI_FLASH
select SPI_FLASH_SPANSION
+config CHROMEOS
+ select CHROMEOS_VBNV_FLASH
+
config MAINBOARD_DIR
string
default google/cosmos
diff --git a/src/mainboard/google/cyan/Kconfig b/src/mainboard/google/cyan/Kconfig
index 094c629..5bb0e4e 100644
--- a/src/mainboard/google/cyan/Kconfig
+++ b/src/mainboard/google/cyan/Kconfig
@@ -5,11 +5,9 @@
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
select EC_GOOGLE_CHROMEEC_MEC
select EC_GOOGLE_CHROMEEC_ACPI_MEMMAP
- select EC_SOFTWARE_SYNC
select ENABLE_BUILTIN_COM1
select HAVE_ACPI_TABLES
select HAVE_OPTION_TABLE
@@ -19,7 +17,11 @@
select VBOOT_DYNAMIC_WORK_BUFFER
select VIRTUAL_DEV_SWITCH
select HAVE_ACPI_RESUME
+
+config CHROMEOS
select LID_SWITCH
+ select CHROMEOS_VBNV_CMOS
+ select EC_SOFTWARE_SYNC
config DISPLAY_SPD_DATA
bool "Display Memory Serial Presence Detect Data"
diff --git a/src/mainboard/google/daisy/Kconfig b/src/mainboard/google/daisy/Kconfig
index c69c390..5c3b643 100644
--- a/src/mainboard/google/daisy/Kconfig
+++ b/src/mainboard/google/daisy/Kconfig
@@ -30,6 +30,8 @@
select DRIVER_TI_TPS65090
select MAINBOARD_HAS_NATIVE_VGA_INIT
select MAINBOARD_DO_NATIVE_VGA_INIT
+
+config CHROMEOS
select CHROMEOS_VBNV_EC
config MAINBOARD_DIR
diff --git a/src/mainboard/google/falco/Kconfig b/src/mainboard/google/falco/Kconfig
index e029382..cbcd57d3 100644
--- a/src/mainboard/google/falco/Kconfig
+++ b/src/mainboard/google/falco/Kconfig
@@ -9,7 +9,6 @@
select INTEL_LYNXPOINT_LP
select BOARD_ROMSIZE_KB_8192
select EC_GOOGLE_CHROMEEC
- select EC_SOFTWARE_SYNC
select VIRTUAL_DEV_SWITCH
select HAVE_ACPI_TABLES
select HAVE_OPTION_TABLE
@@ -21,8 +20,11 @@
select MAINBOARD_HAS_NATIVE_VGA_INIT
select MAINBOARD_DO_NATIVE_VGA_INIT
select INTEL_INT15
+
+config CHROMEOS
select CHROMEOS_VBNV_CMOS
select LID_SWITCH
+ select EC_SOFTWARE_SYNC
config MAINBOARD_DIR
string
diff --git a/src/mainboard/google/foster/Kconfig b/src/mainboard/google/foster/Kconfig
index b8fe708..373cb07 100644
--- a/src/mainboard/google/foster/Kconfig
+++ b/src/mainboard/google/foster/Kconfig
@@ -23,7 +23,6 @@
def_bool y
select BOARD_ID_AUTO
select BOARD_ROMSIZE_KB_4096
- select CHROMEOS_VBNV_FLASH
select SPI_FLASH
select SOC_NVIDIA_TEGRA210
select MAINBOARD_HAS_CHROMEOS
@@ -32,6 +31,9 @@
select COMMON_CBFS_SPI_WRAPPER
select SPI_FLASH_WINBOND
+config CHROMEOS
+ select CHROMEOS_VBNV_FLASH
+
config MAINBOARD_DIR
string
default google/foster
diff --git a/src/mainboard/google/glados/Kconfig b/src/mainboard/google/glados/Kconfig
index d91aca5..767b513 100644
--- a/src/mainboard/google/glados/Kconfig
+++ b/src/mainboard/google/glados/Kconfig
@@ -4,26 +4,28 @@
def_bool y
select BOARD_ROMSIZE_KB_16384
select CACHE_ROM
- select CHROMEOS_RAMOOPS_DYNAMIC
- select CHROMEOS_VBNV_CMOS
select EC_GOOGLE_CHROMEEC
select EC_GOOGLE_CHROMEEC_LPC
select EC_GOOGLE_CHROMEEC_MEC
select EC_GOOGLE_CHROMEEC_ACPI_MEMMAP
- select EC_SOFTWARE_SYNC
select HAVE_ACPI_RESUME
select HAVE_ACPI_TABLES
select HAVE_OPTION_TABLE
select HAVE_SMI_HANDLER
- select LID_SWITCH
select MAINBOARD_HAS_CHROMEOS
select MARK_GRAPHICS_MEM_WRCOMB
select MMCONF_SUPPORT
select MONOTONIC_TIMER_MSR
select SOC_INTEL_SKYLAKE
- select VBOOT_OPROM_MATTERS
select VIRTUAL_DEV_SWITCH
+config CHROMEOS
+ select CHROMEOS_RAMOOPS_DYNAMIC
+ select CHROMEOS_VBNV_CMOS
+ select EC_SOFTWARE_SYNC
+ select LID_SWITCH
+ select VBOOT_OPROM_MATTERS
+
config IRQ_SLOT_COUNT
int
default 18
diff --git a/src/mainboard/google/jecht/Kconfig b/src/mainboard/google/jecht/Kconfig
index 83b091d..90e9cea 100644
--- a/src/mainboard/google/jecht/Kconfig
+++ b/src/mainboard/google/jecht/Kconfig
@@ -13,10 +13,12 @@
select HAVE_SMI_HANDLER
select MAINBOARD_HAS_CHROMEOS
select MAINBOARD_HAS_LPC_TPM
- select CHROMEOS_RAMOOPS_DYNAMIC
select INTEL_INT15
+
+config CHROMEOS
select CHROMEOS_VBNV_CMOS
select PHYSICAL_REC_SWITCH
+ select CHROMEOS_RAMOOPS_DYNAMIC
config MAINBOARD_DIR
string
diff --git a/src/mainboard/google/link/Kconfig b/src/mainboard/google/link/Kconfig
index fd3390a..ac06a62 100644
--- a/src/mainboard/google/link/Kconfig
+++ b/src/mainboard/google/link/Kconfig
@@ -15,6 +15,8 @@
select MAINBOARD_HAS_LPC_TPM
select SERIRQ_CONTINUOUS_MODE
select MAINBOARD_HAS_NATIVE_VGA_INIT
+
+config CHROMEOS
select CHROMEOS_VBNV_CMOS
select LID_SWITCH
diff --git a/src/mainboard/google/nyan/Kconfig b/src/mainboard/google/nyan/Kconfig
index d771ca6..bd390e4 100644
--- a/src/mainboard/google/nyan/Kconfig
+++ b/src/mainboard/google/nyan/Kconfig
@@ -25,14 +25,16 @@
select MAINBOARD_HAS_CHROMEOS
select EC_GOOGLE_CHROMEEC
select EC_GOOGLE_CHROMEEC_SPI
- select EC_SOFTWARE_SYNC
select TEGRA124_MODEL_CD570M
select MAINBOARD_DO_NATIVE_VGA_INIT
select BOARD_ROMSIZE_KB_4096
select SPI_FLASH
select SPI_FLASH_FAST_READ_DUAL_OUTPUT_3B
select VIRTUAL_DEV_SWITCH
+
+config CHROMEOS
select CHROMEOS_VBNV_EC
+ select EC_SOFTWARE_SYNC
config MAINBOARD_DIR
string
diff --git a/src/mainboard/google/nyan_big/Kconfig b/src/mainboard/google/nyan_big/Kconfig
index 55ded30..e187a66 100644
--- a/src/mainboard/google/nyan_big/Kconfig
+++ b/src/mainboard/google/nyan_big/Kconfig
@@ -26,13 +26,15 @@
select BOARD_ID_AUTO
select EC_GOOGLE_CHROMEEC
select EC_GOOGLE_CHROMEEC_SPI
- select EC_SOFTWARE_SYNC
select TEGRA124_MODEL_CD570M
select MAINBOARD_DO_NATIVE_VGA_INIT
select BOARD_ROMSIZE_KB_4096
select SPI_FLASH
select SPI_FLASH_FAST_READ_DUAL_OUTPUT_3B
select VIRTUAL_DEV_SWITCH
+
+config CHROMEOS
+ select EC_SOFTWARE_SYNC
select CHROMEOS_VBNV_EC
config MAINBOARD_DIR
diff --git a/src/mainboard/google/nyan_blaze/Kconfig b/src/mainboard/google/nyan_blaze/Kconfig
index 5316523..29191f2 100644
--- a/src/mainboard/google/nyan_blaze/Kconfig
+++ b/src/mainboard/google/nyan_blaze/Kconfig
@@ -25,7 +25,6 @@
select BOARD_ID_AUTO
select EC_GOOGLE_CHROMEEC
select EC_GOOGLE_CHROMEEC_SPI
- select EC_SOFTWARE_SYNC
select SOC_NVIDIA_TEGRA124
select TEGRA124_MODEL_CD570M
select MAINBOARD_HAS_CHROMEOS
@@ -34,6 +33,9 @@
select SPI_FLASH
select SPI_FLASH_FAST_READ_DUAL_OUTPUT_3B
select VIRTUAL_DEV_SWITCH
+
+config CHROMEOS
+ select EC_SOFTWARE_SYNC
select CHROMEOS_VBNV_EC
config MAINBOARD_DIR
diff --git a/src/mainboard/google/panther/Kconfig b/src/mainboard/google/panther/Kconfig
index 6fb6c5f..85bc1ff 100644
--- a/src/mainboard/google/panther/Kconfig
+++ b/src/mainboard/google/panther/Kconfig
@@ -17,6 +17,8 @@
select MAINBOARD_HAS_CHROMEOS
select MAINBOARD_HAS_LPC_TPM
select INTEL_INT15
+
+config CHROMEOS
select PHYSICAL_REC_SWITCH
select CHROMEOS_VBNV_CMOS
diff --git a/src/mainboard/google/parrot/Kconfig b/src/mainboard/google/parrot/Kconfig
index 9cf390a..56ebf86 100644
--- a/src/mainboard/google/parrot/Kconfig
+++ b/src/mainboard/google/parrot/Kconfig
@@ -14,6 +14,8 @@
select MAINBOARD_HAS_CHROMEOS
select MAINBOARD_HAS_LPC_TPM
select INTEL_INT15
+
+config CHROMEOS
select CHROMEOS_VBNV_CMOS
# Workaround for EC/KBC IRQ1.
diff --git a/src/mainboard/google/peach_pit/Kconfig b/src/mainboard/google/peach_pit/Kconfig
index 3a94dec..016ecb9 100644
--- a/src/mainboard/google/peach_pit/Kconfig
+++ b/src/mainboard/google/peach_pit/Kconfig
@@ -28,6 +28,8 @@
select MAINBOARD_HAS_NATIVE_VGA_INIT
select MAINBOARD_DO_NATIVE_VGA_INIT
select DRIVER_PARADE_PS8625
+
+config CHROMEOS
select CHROMEOS_VBNV_EC
config MAINBOARD_DIR
diff --git a/src/mainboard/google/peppy/Kconfig b/src/mainboard/google/peppy/Kconfig
index b507953..66203ce 100644
--- a/src/mainboard/google/peppy/Kconfig
+++ b/src/mainboard/google/peppy/Kconfig
@@ -9,7 +9,6 @@
select INTEL_LYNXPOINT_LP
select BOARD_ROMSIZE_KB_8192
select EC_GOOGLE_CHROMEEC
- select EC_SOFTWARE_SYNC
select VIRTUAL_DEV_SWITCH
select HAVE_ACPI_TABLES
select HAVE_OPTION_TABLE
@@ -23,8 +22,11 @@
select INTEL_DP
select INTEL_DDI
select INTEL_INT15
+
+config CHROMEOS
select CHROMEOS_VBNV_CMOS
select LID_SWITCH
+ select EC_SOFTWARE_SYNC
config MAINBOARD_DIR
string
diff --git a/src/mainboard/google/purin/Kconfig b/src/mainboard/google/purin/Kconfig
index be6d050..67aaca5 100644
--- a/src/mainboard/google/purin/Kconfig
+++ b/src/mainboard/google/purin/Kconfig
@@ -23,7 +23,6 @@
def_bool y
select BOARD_ID_AUTO
select BOARD_ROMSIZE_KB_2048
- select CHROMEOS_VBNV_FLASH
select COMMON_CBFS_SPI_WRAPPER
select HAVE_HARD_RESET
select MAINBOARD_HAS_CHROMEOS
@@ -33,6 +32,9 @@
select SPI_FLASH_STMICRO # required for the reference board BCM958305K
select SPI_ATOMIC_SEQUENCING
+config CHROMEOS
+ select CHROMEOS_VBNV_FLASH
+
config MAINBOARD_DIR
string
default google/purin
diff --git a/src/mainboard/google/rambi/Kconfig b/src/mainboard/google/rambi/Kconfig
index 45c3ece..9459675 100644
--- a/src/mainboard/google/rambi/Kconfig
+++ b/src/mainboard/google/rambi/Kconfig
@@ -4,7 +4,6 @@
def_bool y
select SOC_INTEL_BAYTRAIL
select EC_GOOGLE_CHROMEEC
- select EC_SOFTWARE_SYNC
select VIRTUAL_DEV_SWITCH
select ENABLE_BUILTIN_COM1
select BOARD_ROMSIZE_KB_8192
@@ -15,8 +14,11 @@
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
select LID_SWITCH
+ select EC_SOFTWARE_SYNC
config MAINBOARD_DIR
string
diff --git a/src/mainboard/google/rush/Kconfig b/src/mainboard/google/rush/Kconfig
index cee8afa..573bff9 100644
--- a/src/mainboard/google/rush/Kconfig
+++ b/src/mainboard/google/rush/Kconfig
@@ -24,7 +24,6 @@
select BOARD_ID_AUTO
select EC_GOOGLE_CHROMEEC
select EC_GOOGLE_CHROMEEC_SPI
- select EC_SOFTWARE_SYNC
select MAINBOARD_DO_NATIVE_VGA_INIT
select SPI_FLASH
select SOC_NVIDIA_TEGRA132
@@ -33,7 +32,10 @@
select VIRTUAL_DEV_SWITCH
select BOARD_ROMSIZE_KB_4096
select ARM64_USE_SPINTABLE
+
+config CHROMEOS
select CHROMEOS_VBNV_EC
+ select EC_SOFTWARE_SYNC
config MAINBOARD_DIR
string
diff --git a/src/mainboard/google/rush_ryu/Kconfig b/src/mainboard/google/rush_ryu/Kconfig
index a91b9ea..6205f2d 100644
--- a/src/mainboard/google/rush_ryu/Kconfig
+++ b/src/mainboard/google/rush_ryu/Kconfig
@@ -25,7 +25,6 @@
select EC_GOOGLE_CHROMEEC
select EC_GOOGLE_CHROMEEC_I2C
select EC_GOOGLE_CHROMEEC_I2C_PROTO3
- select EC_SOFTWARE_SYNC
select MAINBOARD_DO_NATIVE_VGA_INIT
select SPI_FLASH
select SOC_NVIDIA_TEGRA132
@@ -34,7 +33,10 @@
select BOARD_ROMSIZE_KB_8192
select VIRTUAL_DEV_SWITCH
select ARM64_USE_SPINTABLE
+
+config CHROMEOS
select CHROMEOS_VBNV_EC
+ select EC_SOFTWARE_SYNC
config MAINBOARD_DIR
string
diff --git a/src/mainboard/google/samus/Kconfig b/src/mainboard/google/samus/Kconfig
index 0b4d74d..e45b22f 100644
--- a/src/mainboard/google/samus/Kconfig
+++ b/src/mainboard/google/samus/Kconfig
@@ -5,9 +5,6 @@
select SOC_INTEL_BROADWELL
select BOARD_ROMSIZE_KB_8192
select EC_GOOGLE_CHROMEEC
- select EC_SOFTWARE_SYNC
- select VBOOT_EC_SLOW_UPDATE
- select VBOOT_OPROM_MATTERS
select VIRTUAL_DEV_SWITCH
select HAVE_ACPI_TABLES
select HAVE_OPTION_TABLE
@@ -16,10 +13,15 @@
select HAVE_SMI_HANDLER
select MAINBOARD_HAS_CHROMEOS
select MAINBOARD_HAS_LPC_TPM
- select CHROMEOS_RAMOOPS_DYNAMIC
select INTEL_INT15
+
+config CHROMEOS
select CHROMEOS_VBNV_CMOS
select LID_SWITCH
+ select EC_SOFTWARE_SYNC
+ select VBOOT_EC_SLOW_UPDATE
+ select VBOOT_OPROM_MATTERS
+ select CHROMEOS_RAMOOPS_DYNAMIC
config MAINBOARD_DIR
string
diff --git a/src/mainboard/google/slippy/Kconfig b/src/mainboard/google/slippy/Kconfig
index ba83683..8f9f518 100644
--- a/src/mainboard/google/slippy/Kconfig
+++ b/src/mainboard/google/slippy/Kconfig
@@ -8,7 +8,6 @@
select INTEL_LYNXPOINT_LP
select BOARD_ROMSIZE_KB_8192
select EC_GOOGLE_CHROMEEC
- select EC_SOFTWARE_SYNC
select VIRTUAL_DEV_SWITCH
select HAVE_ACPI_TABLES
select HAVE_OPTION_TABLE
@@ -20,8 +19,11 @@
select INTEL_DP
select INTEL_DDI
select INTEL_INT15
+
+config CHROMEOS
select CHROMEOS_VBNV_CMOS
select LID_SWITCH
+ select EC_SOFTWARE_SYNC
config MAINBOARD_DIR
string
diff --git a/src/mainboard/google/smaug/Kconfig b/src/mainboard/google/smaug/Kconfig
index 29dae4f..0fe9f68 100644
--- a/src/mainboard/google/smaug/Kconfig
+++ b/src/mainboard/google/smaug/Kconfig
@@ -23,12 +23,10 @@
def_bool y
select BOARD_ID_AUTO
select BOARD_ROMSIZE_KB_16384
- select CHROMEOS_VBNV_FLASH
select COMMON_CBFS_SPI_WRAPPER
select EC_GOOGLE_CHROMEEC
select EC_GOOGLE_CHROMEEC_I2C
select EC_GOOGLE_CHROMEEC_I2C_PROTO3
- select EC_SOFTWARE_SYNC
select MAINBOARD_DO_NATIVE_VGA_INIT
select SPI_FLASH
select SPI_FLASH_WINBOND
@@ -38,6 +36,10 @@
select VIRTUAL_DEV_SWITCH
select RAM_CODE_SUPPORT
+config CHROMEOS
+ select CHROMEOS_VBNV_FLASH
+ select EC_SOFTWARE_SYNC
+
config MAINBOARD_DIR
string
default google/smaug
diff --git a/src/mainboard/google/storm/Kconfig b/src/mainboard/google/storm/Kconfig
index 55cc5ba..404ab4d 100644
--- a/src/mainboard/google/storm/Kconfig
+++ b/src/mainboard/google/storm/Kconfig
@@ -31,12 +31,14 @@
select SPI_FLASH
select SPI_FLASH_SPANSION
select SPI_FLASH_STMICRO
- select VBOOT_DISABLE_DEV_ON_RECOVERY
select VIRTUAL_DEV_SWITCH
- select WIPEOUT_SUPPORTED
select DRIVERS_UART
select CONSOLE_CBMEM_DUMP_TO_UART
+config CHROMEOS
+ select VBOOT_DISABLE_DEV_ON_RECOVERY
+ select WIPEOUT_SUPPORTED
+
config BOARD_VARIANT_AP148
bool "pick this to build an image for ap148"
default n
diff --git a/src/mainboard/google/stout/Kconfig b/src/mainboard/google/stout/Kconfig
index eca83da..3f73295 100644
--- a/src/mainboard/google/stout/Kconfig
+++ b/src/mainboard/google/stout/Kconfig
@@ -15,6 +15,8 @@
select MAINBOARD_HAS_CHROMEOS
select MAINBOARD_HAS_LPC_TPM
select INTEL_INT15
+
+config CHROMEOS
select CHROMEOS_VBNV_CMOS
config MAINBOARD_DIR
diff --git a/src/mainboard/google/veyron_brain/Kconfig b/src/mainboard/google/veyron_brain/Kconfig
index e76496b..eb70f3a 100644
--- a/src/mainboard/google/veyron_brain/Kconfig
+++ b/src/mainboard/google/veyron_brain/Kconfig
@@ -27,14 +27,16 @@
select HAVE_HARD_RESET
select MAINBOARD_DO_NATIVE_VGA_INIT
select MAINBOARD_HAS_CHROMEOS
- select PHYSICAL_REC_SWITCH
select RAM_CODE_SUPPORT
select SOC_ROCKCHIP_RK3288
select SPI_FLASH
select SPI_FLASH_GIGADEVICE
select SPI_FLASH_WINBOND
select VIRTUAL_DEV_SWITCH
+
+config CHROMEOS
select CHROMEOS_VBNV_FLASH
+ select PHYSICAL_REC_SWITCH
config MAINBOARD_DIR
string
diff --git a/src/mainboard/google/veyron_danger/Kconfig b/src/mainboard/google/veyron_danger/Kconfig
index e2128eb..8160046 100644
--- a/src/mainboard/google/veyron_danger/Kconfig
+++ b/src/mainboard/google/veyron_danger/Kconfig
@@ -23,18 +23,20 @@
def_bool y
select BOARD_ID_AUTO
select BOARD_ROMSIZE_KB_4096
- select CHROMEOS_VBNV_FLASH
select COMMON_CBFS_SPI_WRAPPER
select HAVE_HARD_RESET
select MAINBOARD_DO_NATIVE_VGA_INIT
select MAINBOARD_HAS_CHROMEOS
- select PHYSICAL_REC_SWITCH
select RAM_CODE_SUPPORT
select SOC_ROCKCHIP_RK3288
select SPI_FLASH
select SPI_FLASH_GIGADEVICE
select SPI_FLASH_WINBOND
+config CHROMEOS
+ select CHROMEOS_VBNV_FLASH
+ select PHYSICAL_REC_SWITCH
+
config MAINBOARD_DIR
string
default google/veyron_danger
diff --git a/src/mainboard/google/veyron_jerry/Kconfig b/src/mainboard/google/veyron_jerry/Kconfig
index 3e65e67..566e0a9 100644
--- a/src/mainboard/google/veyron_jerry/Kconfig
+++ b/src/mainboard/google/veyron_jerry/Kconfig
@@ -22,11 +22,9 @@
config BOARD_SPECIFIC_OPTIONS # dummy
def_bool y
select BOARD_ID_AUTO
- select CHROMEOS_VBNV_EC
select COMMON_CBFS_SPI_WRAPPER
select EC_GOOGLE_CHROMEEC
select EC_GOOGLE_CHROMEEC_SPI
- select EC_SOFTWARE_SYNC
select RAM_CODE_SUPPORT
select SOC_ROCKCHIP_RK3288
select MAINBOARD_DO_NATIVE_VGA_INIT
@@ -38,6 +36,10 @@
select SPI_FLASH_WINBOND
select VIRTUAL_DEV_SWITCH
+config CHROMEOS
+ select CHROMEOS_VBNV_EC
+ select EC_SOFTWARE_SYNC
+
config MAINBOARD_DIR
string
default google/veyron_jerry
diff --git a/src/mainboard/google/veyron_mickey/Kconfig b/src/mainboard/google/veyron_mickey/Kconfig
index 9233a91..3c90dcc 100644
--- a/src/mainboard/google/veyron_mickey/Kconfig
+++ b/src/mainboard/google/veyron_mickey/Kconfig
@@ -27,14 +27,16 @@
select HAVE_HARD_RESET
select MAINBOARD_DO_NATIVE_VGA_INIT
select MAINBOARD_HAS_CHROMEOS
- select PHYSICAL_REC_SWITCH
select RAM_CODE_SUPPORT
select SOC_ROCKCHIP_RK3288
select SPI_FLASH
select SPI_FLASH_GIGADEVICE
select SPI_FLASH_WINBOND
select VIRTUAL_DEV_SWITCH
+
+config CHROMEOS
select CHROMEOS_VBNV_FLASH
+ select PHYSICAL_REC_SWITCH
config MAINBOARD_DIR
string
diff --git a/src/mainboard/google/veyron_mighty/Kconfig b/src/mainboard/google/veyron_mighty/Kconfig
index 90cdbb5..8d22da7 100644
--- a/src/mainboard/google/veyron_mighty/Kconfig
+++ b/src/mainboard/google/veyron_mighty/Kconfig
@@ -22,11 +22,9 @@
config BOARD_SPECIFIC_OPTIONS # dummy
def_bool y
select BOARD_ID_AUTO
- select CHROMEOS_VBNV_EC
select COMMON_CBFS_SPI_WRAPPER
select EC_GOOGLE_CHROMEEC
select EC_GOOGLE_CHROMEEC_SPI
- select EC_SOFTWARE_SYNC
select RAM_CODE_SUPPORT
select SOC_ROCKCHIP_RK3288
select MAINBOARD_DO_NATIVE_VGA_INIT
@@ -38,6 +36,10 @@
select SPI_FLASH_WINBOND
select VIRTUAL_DEV_SWITCH
+config CHROMEOS
+ select CHROMEOS_VBNV_EC
+ select EC_SOFTWARE_SYNC
+
config MAINBOARD_DIR
string
default google/veyron_mighty
diff --git a/src/mainboard/google/veyron_minnie/Kconfig b/src/mainboard/google/veyron_minnie/Kconfig
index a2d4846..930a1ba 100644
--- a/src/mainboard/google/veyron_minnie/Kconfig
+++ b/src/mainboard/google/veyron_minnie/Kconfig
@@ -23,11 +23,9 @@
def_bool y
select BOARD_ID_AUTO
select BOARD_ROMSIZE_KB_4096
- select CHROMEOS_VBNV_EC
select COMMON_CBFS_SPI_WRAPPER
select EC_GOOGLE_CHROMEEC
select EC_GOOGLE_CHROMEEC_SPI
- select EC_SOFTWARE_SYNC
select RAM_CODE_SUPPORT
select SOC_ROCKCHIP_RK3288
select MAINBOARD_DO_NATIVE_VGA_INIT
@@ -38,6 +36,10 @@
select SPI_FLASH_WINBOND
select VIRTUAL_DEV_SWITCH
+config CHROMEOS
+ select CHROMEOS_VBNV_EC
+ select EC_SOFTWARE_SYNC
+
config MAINBOARD_DIR
string
default google/veyron_minnie
diff --git a/src/mainboard/google/veyron_pinky/Kconfig b/src/mainboard/google/veyron_pinky/Kconfig
index 4b0d471..818b525 100644
--- a/src/mainboard/google/veyron_pinky/Kconfig
+++ b/src/mainboard/google/veyron_pinky/Kconfig
@@ -22,11 +22,9 @@
config BOARD_SPECIFIC_OPTIONS # dummy
def_bool y
select BOARD_ID_AUTO
- select CHROMEOS_VBNV_EC
select COMMON_CBFS_SPI_WRAPPER
select EC_GOOGLE_CHROMEEC
select EC_GOOGLE_CHROMEEC_SPI
- select EC_SOFTWARE_SYNC
select RAM_CODE_SUPPORT
select SOC_ROCKCHIP_RK3288
select MAINBOARD_DO_NATIVE_VGA_INIT
@@ -38,6 +36,10 @@
select SPI_FLASH_WINBOND
select VIRTUAL_DEV_SWITCH
+config CHROMEOS
+ select CHROMEOS_VBNV_EC
+ select EC_SOFTWARE_SYNC
+
config MAINBOARD_DIR
string
default google/veyron_pinky
diff --git a/src/mainboard/google/veyron_rialto/Kconfig b/src/mainboard/google/veyron_rialto/Kconfig
index 0061bfa..a038184 100644
--- a/src/mainboard/google/veyron_rialto/Kconfig
+++ b/src/mainboard/google/veyron_rialto/Kconfig
@@ -23,12 +23,10 @@
def_bool y
select BOARD_ID_AUTO
select BOARD_ROMSIZE_KB_4096
- select CHROMEOS_VBNV_FLASH
select COMMON_CBFS_SPI_WRAPPER
select HAVE_HARD_RESET
select MAINBOARD_DO_NATIVE_VGA_INIT
select MAINBOARD_HAS_CHROMEOS
- select PHYSICAL_REC_SWITCH
select RAM_CODE_SUPPORT
select SOC_ROCKCHIP_RK3288
select SPI_FLASH
@@ -36,6 +34,10 @@
select SPI_FLASH_WINBOND
select VIRTUAL_DEV_SWITCH
+config CHROMEOS
+ select CHROMEOS_VBNV_FLASH
+ select PHYSICAL_REC_SWITCH
+
config MAINBOARD_DIR
string
default google/veyron_rialto
diff --git a/src/mainboard/google/veyron_romy/Kconfig b/src/mainboard/google/veyron_romy/Kconfig
index b7f05d7..1570cee 100644
--- a/src/mainboard/google/veyron_romy/Kconfig
+++ b/src/mainboard/google/veyron_romy/Kconfig
@@ -27,14 +27,16 @@
select HAVE_HARD_RESET
select MAINBOARD_DO_NATIVE_VGA_INIT
select MAINBOARD_HAS_CHROMEOS
- select PHYSICAL_REC_SWITCH
select RAM_CODE_SUPPORT
select SOC_ROCKCHIP_RK3288
select SPI_FLASH
select SPI_FLASH_GIGADEVICE
select SPI_FLASH_WINBOND
select VIRTUAL_DEV_SWITCH
+
+config CHROMEOS
select CHROMEOS_VBNV_FLASH
+ select PHYSICAL_REC_SWITCH
config MAINBOARD_DIR
string
diff --git a/src/mainboard/google/veyron_shark/Kconfig b/src/mainboard/google/veyron_shark/Kconfig
index 0cefbc6d..01068bf 100644
--- a/src/mainboard/google/veyron_shark/Kconfig
+++ b/src/mainboard/google/veyron_shark/Kconfig
@@ -23,11 +23,9 @@
def_bool y
select BOARD_ID_AUTO
select BOARD_ROMSIZE_KB_4096
- select CHROMEOS_VBNV_EC
select COMMON_CBFS_SPI_WRAPPER
select EC_GOOGLE_CHROMEEC
select EC_GOOGLE_CHROMEEC_SPI
- select EC_SOFTWARE_SYNC
select RAM_CODE_SUPPORT
select SOC_ROCKCHIP_RK3288
select MAINBOARD_DO_NATIVE_VGA_INIT
@@ -38,6 +36,10 @@
select SPI_FLASH_WINBOND
select VIRTUAL_DEV_SWITCH
+config CHROMEOS
+ select CHROMEOS_VBNV_EC
+ select EC_SOFTWARE_SYNC
+
config MAINBOARD_DIR
string
default google/veyron_shark
diff --git a/src/mainboard/google/veyron_speedy/Kconfig b/src/mainboard/google/veyron_speedy/Kconfig
index d4003dc..882571c 100644
--- a/src/mainboard/google/veyron_speedy/Kconfig
+++ b/src/mainboard/google/veyron_speedy/Kconfig
@@ -23,11 +23,9 @@
def_bool y
select BOARD_ID_AUTO
select BOARD_ROMSIZE_KB_4096
- select CHROMEOS_VBNV_EC
select COMMON_CBFS_SPI_WRAPPER
select EC_GOOGLE_CHROMEEC
select EC_GOOGLE_CHROMEEC_SPI
- select EC_SOFTWARE_SYNC
select RAM_CODE_SUPPORT
select SOC_ROCKCHIP_RK3288
select MAINBOARD_DO_NATIVE_VGA_INIT
@@ -38,6 +36,10 @@
select SPI_FLASH_WINBOND
select VIRTUAL_DEV_SWITCH
+config CHROMEOS
+ select CHROMEOS_VBNV_EC
+ select EC_SOFTWARE_SYNC
+
config MAINBOARD_DIR
string
default google/veyron_speedy
diff --git a/src/mainboard/intel/baskingridge/Kconfig b/src/mainboard/intel/baskingridge/Kconfig
index f916138..47aca1a 100644
--- a/src/mainboard/intel/baskingridge/Kconfig
+++ b/src/mainboard/intel/baskingridge/Kconfig
@@ -13,6 +13,8 @@
select MAINBOARD_HAS_CHROMEOS
select MAINBOARD_HAS_LPC_TPM
select INTEL_INT15
+
+config CHROMEOS
select CHROMEOS_VBNV_CMOS
config MAINBOARD_DIR
diff --git a/src/mainboard/intel/emeraldlake2/Kconfig b/src/mainboard/intel/emeraldlake2/Kconfig
index 74b8270..90b40ac 100644
--- a/src/mainboard/intel/emeraldlake2/Kconfig
+++ b/src/mainboard/intel/emeraldlake2/Kconfig
@@ -12,6 +12,8 @@
select HAVE_ACPI_RESUME
select INTEL_INT15
#select MAINBOARD_HAS_CHROMEOS
+
+config CHROMEOS
#select CHROMEOS_VBNV_CMOS
config MAINBOARD_DIR
diff --git a/src/mainboard/intel/kunimitsu/Kconfig b/src/mainboard/intel/kunimitsu/Kconfig
index cb7ce29..4cdb272 100644
--- a/src/mainboard/intel/kunimitsu/Kconfig
+++ b/src/mainboard/intel/kunimitsu/Kconfig
@@ -4,8 +4,6 @@
def_bool y
select BOARD_ROMSIZE_KB_16384
select CACHE_ROM
- select CHROMEOS_RAMOOPS_DYNAMIC
- select CHROMEOS_VBNV_CMOS
select EC_GOOGLE_CHROMEEC
select EC_GOOGLE_CHROMEEC_LPC
select EC_GOOGLE_CHROMEEC_MEC
@@ -14,15 +12,19 @@
select HAVE_ACPI_TABLES
select HAVE_OPTION_TABLE
select HAVE_SMI_HANDLER
- select LID_SWITCH
select MAINBOARD_HAS_CHROMEOS
select MARK_GRAPHICS_MEM_WRCOMB
select MMCONF_SUPPORT
select MONOTONIC_TIMER_MSR
select SOC_INTEL_SKYLAKE
- select VBOOT_OPROM_MATTERS
select VIRTUAL_DEV_SWITCH
+config CHROMEOS
+ select CHROMEOS_RAMOOPS_DYNAMIC
+ select CHROMEOS_VBNV_CMOS
+ select LID_SWITCH
+ select VBOOT_OPROM_MATTERS
+
config IRQ_SLOT_COUNT
int
default 18
diff --git a/src/mainboard/intel/sklrvp/Kconfig b/src/mainboard/intel/sklrvp/Kconfig
index 1741469..b69600d 100644
--- a/src/mainboard/intel/sklrvp/Kconfig
+++ b/src/mainboard/intel/sklrvp/Kconfig
@@ -4,8 +4,6 @@
def_bool y
select BOARD_ROMSIZE_KB_16384
select CACHE_ROM
- select CHROMEOS_RAMOOPS_DYNAMIC
- select CHROMEOS_VBNV_CMOS
select HAVE_ACPI_RESUME
select HAVE_ACPI_TABLES
select HAVE_OPTION_TABLE
@@ -18,7 +16,11 @@
select SOC_INTEL_SKYLAKE
select VBOOT_DYNAMIC_WORK_BUFFER
select VIRTUAL_DEV_SWITCH
+
+config CHROMEOS
select LID_SWITCH
+ select CHROMEOS_RAMOOPS_DYNAMIC
+ select CHROMEOS_VBNV_CMOS
config IRQ_SLOT_COUNT
int
diff --git a/src/mainboard/intel/strago/Kconfig b/src/mainboard/intel/strago/Kconfig
index 599a84a..0a59e9b 100755
--- a/src/mainboard/intel/strago/Kconfig
+++ b/src/mainboard/intel/strago/Kconfig
@@ -5,11 +5,9 @@
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
select EC_GOOGLE_CHROMEEC_MEC
select EC_GOOGLE_CHROMEEC_ACPI_MEMMAP
- select EC_SOFTWARE_SYNC
select ENABLE_BUILTIN_COM1
select HAVE_ACPI_RESUME
select HAVE_ACPI_TABLES
@@ -19,7 +17,11 @@
select SOC_INTEL_BRASWELL
select VBOOT_DYNAMIC_WORK_BUFFER
select VIRTUAL_DEV_SWITCH
+
+config CHROMEOS
select LID_SWITCH
+ select CHROMEOS_VBNV_CMOS
+ select EC_SOFTWARE_SYNC
config DISPLAY_SPD_DATA
diff --git a/src/mainboard/intel/wtm2/Kconfig b/src/mainboard/intel/wtm2/Kconfig
index b8f616a..e739efa 100644
--- a/src/mainboard/intel/wtm2/Kconfig
+++ b/src/mainboard/intel/wtm2/Kconfig
@@ -13,6 +13,7 @@
select MAINBOARD_HAS_NATIVE_VGA_INIT
select INTEL_INT15
+config CHROMEOS
select CHROMEOS_RAMOOPS_DYNAMIC
select CHROMEOS_VBNV_CMOS
diff --git a/src/mainboard/samsung/lumpy/Kconfig b/src/mainboard/samsung/lumpy/Kconfig
index fed4610..e144545 100644
--- a/src/mainboard/samsung/lumpy/Kconfig
+++ b/src/mainboard/samsung/lumpy/Kconfig
@@ -20,6 +20,8 @@
select DRIVERS_GENERIC_IOAPIC
select INTEL_INT15
select HAVE_MRC
+
+config CHROMEOS
select CHROMEOS_VBNV_CMOS
config MAINBOARD_DIR
diff --git a/src/mainboard/samsung/stumpy/Kconfig b/src/mainboard/samsung/stumpy/Kconfig
index f749c39..874dd6c 100644
--- a/src/mainboard/samsung/stumpy/Kconfig
+++ b/src/mainboard/samsung/stumpy/Kconfig
@@ -12,14 +12,16 @@
select NORTHBRIDGE_INTEL_SANDYBRIDGE
select SOUTHBRIDGE_INTEL_BD82X6X
select SUPERIO_ITE_IT8772F
- select PHYSICAL_REC_SWITCH
# LPC47N207 selected for external LPC card
# not on board, should be made selectable.
select SUPERIO_SMSC_LPC47N207
select HAVE_MRC
+ select INTEL_INT15
+
+config CHROMEOS
+ select PHYSICAL_REC_SWITCH
select CHROMEOS_VBNV_CMOS
- select INTEL_INT15
config MAINBOARD_DIR
string
default samsung/stumpy
diff --git a/src/soc/broadcom/cygnus/Kconfig b/src/soc/broadcom/cygnus/Kconfig
index 7ab305c..75df786 100644
--- a/src/soc/broadcom/cygnus/Kconfig
+++ b/src/soc/broadcom/cygnus/Kconfig
@@ -29,12 +29,14 @@
select HAVE_MONOTONIC_TIMER
select HAVE_UART_SPECIAL
select HAS_PRECBMEM_TIMESTAMP_REGION
- select SEPARATE_VERSTAGE
- select RETURN_FROM_VERSTAGE
select GENERIC_GPIO_LIB
if SOC_BROADCOM_CYGNUS
+config CHROMEOS
+ select SEPARATE_VERSTAGE
+ select RETURN_FROM_VERSTAGE
+
config BOOTBLOCK_CPU_INIT
string
default "soc/broadcom/cygnus/bootblock.c"
diff --git a/src/soc/marvell/bg4cd/Kconfig b/src/soc/marvell/bg4cd/Kconfig
index 930645e..45a2abb 100644
--- a/src/soc/marvell/bg4cd/Kconfig
+++ b/src/soc/marvell/bg4cd/Kconfig
@@ -29,10 +29,12 @@
select GENERIC_UDELAY
select HAVE_MONOTONIC_TIMER
select GENERIC_GPIO_LIB
- select VBOOT_STARTS_IN_BOOTBLOCK
if SOC_MARVELL_BG4CD
+config CHROMEOS
+ select VBOOT_STARTS_IN_BOOTBLOCK
+
config BOOTBLOCK_CPU_INIT
string
default "soc/marvell/bg4cd/bootblock.c"
diff --git a/src/soc/nvidia/tegra210/Kconfig b/src/soc/nvidia/tegra210/Kconfig
index 7aff588..f899803 100644
--- a/src/soc/nvidia/tegra210/Kconfig
+++ b/src/soc/nvidia/tegra210/Kconfig
@@ -16,11 +16,13 @@
select ARM_BOOTBLOCK_CUSTOM
select ARM64_USE_ARM_TRUSTED_FIRMWARE
select HAS_PRECBMEM_TIMESTAMP_REGION
- select CHROMEOS_RAMOOPS_NON_ACPI
select GENERIC_GPIO_LIB
if SOC_NVIDIA_TEGRA210
+config CHROMEOS
+ select CHROMEOS_RAMOOPS_NON_ACPI
+
config MAINBOARD_DO_DSI_INIT
bool "Use dsi graphics interface"
depends on MAINBOARD_DO_NATIVE_VGA_INIT
diff --git a/src/soc/qualcomm/ipq806x/Kconfig b/src/soc/qualcomm/ipq806x/Kconfig
index 9a1e4f9..dd60d63 100644
--- a/src/soc/qualcomm/ipq806x/Kconfig
+++ b/src/soc/qualcomm/ipq806x/Kconfig
@@ -6,16 +6,18 @@
select ARCH_ROMSTAGE_ARMV7
select ARCH_RAMSTAGE_ARMV7
select BOOTBLOCK_CONSOLE
- select CHROMEOS_VBNV_FLASH
select HAS_PRECBMEM_TIMESTAMP_REGION
select HAVE_UART_SPECIAL
select SPI_ATOMIC_SEQUENCING
select GENERIC_GPIO_LIB
- select SEPARATE_VERSTAGE
- select RETURN_FROM_VERSTAGE
if SOC_QC_IPQ806X
+config CHROMEOS
+ select CHROMEOS_VBNV_FLASH
+ select SEPARATE_VERSTAGE
+ select RETURN_FROM_VERSTAGE
+
config MBN_ENCAPSULATION
depends on USE_BLOBS
bool "bootblock encapsulation for ipq8064"
diff --git a/src/soc/rockchip/rk3288/Kconfig b/src/soc/rockchip/rk3288/Kconfig
index 1800b16..bc484e3 100644
--- a/src/soc/rockchip/rk3288/Kconfig
+++ b/src/soc/rockchip/rk3288/Kconfig
@@ -32,12 +32,14 @@
select UNCOMPRESSED_RAMSTAGE
select GENERIC_GPIO_LIB
select RTC
+
+if SOC_ROCKCHIP_RK3288
+
+config CHROMEOS
select VBOOT_STARTS_IN_BOOTBLOCK
select SEPARATE_VERSTAGE
select RETURN_FROM_VERSTAGE
-if SOC_ROCKCHIP_RK3288
-
config BOOTBLOCK_CPU_INIT
string
default "soc/rockchip/rk3288/bootblock.c"