Martin Roth (martinroth@google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/11272
-gerrit
commit ebeee468d4dbef05778a2203bf2f9494e27dab6a Author: Martin Roth martinroth@google.com Date: Tue Aug 18 14:22:58 2015 -0600
ChromeOS: Fix Kconfig dependencies
Add 'if 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 --- src/mainboard/google/auron/Kconfig | 8 ++++---- src/mainboard/google/bolt/Kconfig | 6 +++--- src/mainboard/google/butterfly/Kconfig | 2 +- src/mainboard/google/cosmos/Kconfig | 2 +- src/mainboard/google/cyan/Kconfig | 6 +++--- src/mainboard/google/daisy/Kconfig | 2 +- src/mainboard/google/falco/Kconfig | 6 +++--- src/mainboard/google/foster/Kconfig | 2 +- src/mainboard/google/glados/Kconfig | 10 +++++----- src/mainboard/google/jecht/Kconfig | 6 +++--- src/mainboard/google/link/Kconfig | 4 ++-- src/mainboard/google/nyan/Kconfig | 4 ++-- src/mainboard/google/nyan_big/Kconfig | 4 ++-- src/mainboard/google/nyan_blaze/Kconfig | 4 ++-- src/mainboard/google/panther/Kconfig | 4 ++-- src/mainboard/google/parrot/Kconfig | 2 +- src/mainboard/google/peach_pit/Kconfig | 2 +- src/mainboard/google/peppy/Kconfig | 6 +++--- src/mainboard/google/purin/Kconfig | 2 +- src/mainboard/google/rambi/Kconfig | 6 +++--- src/mainboard/google/rush/Kconfig | 4 ++-- src/mainboard/google/rush_ryu/Kconfig | 4 ++-- src/mainboard/google/samus/Kconfig | 12 ++++++------ src/mainboard/google/slippy/Kconfig | 6 +++--- src/mainboard/google/smaug/Kconfig | 4 ++-- src/mainboard/google/storm/Kconfig | 4 ++-- src/mainboard/google/stout/Kconfig | 2 +- src/mainboard/google/veyron_brain/Kconfig | 4 ++-- src/mainboard/google/veyron_danger/Kconfig | 4 ++-- src/mainboard/google/veyron_jerry/Kconfig | 4 ++-- src/mainboard/google/veyron_mickey/Kconfig | 4 ++-- src/mainboard/google/veyron_mighty/Kconfig | 4 ++-- src/mainboard/google/veyron_minnie/Kconfig | 4 ++-- src/mainboard/google/veyron_pinky/Kconfig | 4 ++-- src/mainboard/google/veyron_rialto/Kconfig | 4 ++-- src/mainboard/google/veyron_romy/Kconfig | 4 ++-- src/mainboard/google/veyron_shark/Kconfig | 4 ++-- src/mainboard/google/veyron_speedy/Kconfig | 4 ++-- src/mainboard/intel/baskingridge/Kconfig | 2 +- src/mainboard/intel/emeraldlake2/Kconfig | 2 +- src/mainboard/intel/kunimitsu/Kconfig | 8 ++++---- src/mainboard/intel/sklrvp/Kconfig | 6 +++--- src/mainboard/intel/strago/Kconfig | 6 +++--- src/mainboard/intel/wtm2/Kconfig | 4 ++-- src/mainboard/samsung/lumpy/Kconfig | 2 +- src/mainboard/samsung/stumpy/Kconfig | 4 ++-- src/soc/broadcom/cygnus/Kconfig | 4 ++-- src/soc/marvell/bg4cd/Kconfig | 2 +- src/soc/nvidia/tegra210/Kconfig | 2 +- src/soc/qualcomm/ipq806x/Kconfig | 6 +++--- src/soc/rockchip/rk3288/Kconfig | 6 +++--- 51 files changed, 111 insertions(+), 111 deletions(-)
diff --git a/src/mainboard/google/auron/Kconfig b/src/mainboard/google/auron/Kconfig index 3a4cb7e..518be1a 100644 --- a/src/mainboard/google/auron/Kconfig +++ b/src/mainboard/google/auron/Kconfig @@ -5,7 +5,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy select SOC_INTEL_BROADWELL select BOARD_ROMSIZE_KB_8192 select EC_GOOGLE_CHROMEEC - select EC_SOFTWARE_SYNC + select EC_SOFTWARE_SYNC if CHROMEOS select VIRTUAL_DEV_SWITCH select HAVE_ACPI_TABLES select HAVE_OPTION_TABLE @@ -14,10 +14,10 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_SMI_HANDLER select MAINBOARD_HAS_CHROMEOS select MAINBOARD_HAS_LPC_TPM - select CHROMEOS_RAMOOPS_DYNAMIC + select CHROMEOS_RAMOOPS_DYNAMIC if CHROMEOS select INTEL_INT15 - select CHROMEOS_VBNV_CMOS - select LID_SWITCH + select CHROMEOS_VBNV_CMOS if CHROMEOS + select LID_SWITCH if CHROMEOS
config VBOOT_RAMSTAGE_INDEX hex diff --git a/src/mainboard/google/bolt/Kconfig b/src/mainboard/google/bolt/Kconfig index 2e37e25..1c4723f 100644 --- a/src/mainboard/google/bolt/Kconfig +++ b/src/mainboard/google/bolt/Kconfig @@ -8,7 +8,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy select INTEL_LYNXPOINT_LP select BOARD_ROMSIZE_KB_8192 select EC_GOOGLE_CHROMEEC - select EC_SOFTWARE_SYNC + select EC_SOFTWARE_SYNC if CHROMEOS select VIRTUAL_DEV_SWITCH select HAVE_ACPI_TABLES select HAVE_OPTION_TABLE @@ -18,8 +18,8 @@ config BOARD_SPECIFIC_OPTIONS # dummy select MAINBOARD_HAS_CHROMEOS select MAINBOARD_HAS_LPC_TPM select INTEL_INT15 - select CHROMEOS_VBNV_CMOS - select LID_SWITCH + select CHROMEOS_VBNV_CMOS if CHROMEOS + select LID_SWITCH if CHROMEOS
config MAINBOARD_DIR string diff --git a/src/mainboard/google/butterfly/Kconfig b/src/mainboard/google/butterfly/Kconfig index b1a64ee..d992467 100644 --- a/src/mainboard/google/butterfly/Kconfig +++ b/src/mainboard/google/butterfly/Kconfig @@ -15,7 +15,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy select MAINBOARD_HAS_CHROMEOS select MAINBOARD_HAS_LPC_TPM select INTEL_INT15 - select CHROMEOS_VBNV_CMOS + select CHROMEOS_VBNV_CMOS if CHROMEOS
# Workaround for EC/KBC IRQ1. select SERIRQ_CONTINUOUS_MODE diff --git a/src/mainboard/google/cosmos/Kconfig b/src/mainboard/google/cosmos/Kconfig index a6c87b1..dae16a3 100644 --- a/src/mainboard/google/cosmos/Kconfig +++ b/src/mainboard/google/cosmos/Kconfig @@ -23,7 +23,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy def_bool y select BOARD_ID_AUTO select BOARD_ROMSIZE_KB_2048 - select CHROMEOS_VBNV_FLASH + select CHROMEOS_VBNV_FLASH if CHROMEOS select COMMON_CBFS_SPI_WRAPPER select HAVE_HARD_RESET select MAINBOARD_HAS_CHROMEOS diff --git a/src/mainboard/google/cyan/Kconfig b/src/mainboard/google/cyan/Kconfig index 91f7587..8f852ab 100644 --- a/src/mainboard/google/cyan/Kconfig +++ b/src/mainboard/google/cyan/Kconfig @@ -6,11 +6,11 @@ config BOARD_SPECIFIC_OPTIONS select ALWAYS_LOAD_OPROM if !PAYLOAD_SEABIOS select BOARD_ROMSIZE_KB_8192 select CHROMEOS - select CHROMEOS_VBNV_CMOS + select CHROMEOS_VBNV_CMOS if CHROMEOS select EC_GOOGLE_CHROMEEC select EC_GOOGLE_CHROMEEC_MEC select EC_GOOGLE_CHROMEEC_ACPI_MEMMAP - select EC_SOFTWARE_SYNC + select EC_SOFTWARE_SYNC if CHROMEOS select ENABLE_BUILTIN_COM1 select HAVE_ACPI_TABLES select HAVE_OPTION_TABLE @@ -20,7 +20,7 @@ config BOARD_SPECIFIC_OPTIONS select VBOOT_DYNAMIC_WORK_BUFFER select VIRTUAL_DEV_SWITCH select HAVE_ACPI_RESUME - select LID_SWITCH + select LID_SWITCH if CHROMEOS
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..6204ffb 100644 --- a/src/mainboard/google/daisy/Kconfig +++ b/src/mainboard/google/daisy/Kconfig @@ -30,7 +30,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy select DRIVER_TI_TPS65090 select MAINBOARD_HAS_NATIVE_VGA_INIT select MAINBOARD_DO_NATIVE_VGA_INIT - select CHROMEOS_VBNV_EC + select CHROMEOS_VBNV_EC if CHROMEOS
config MAINBOARD_DIR string diff --git a/src/mainboard/google/falco/Kconfig b/src/mainboard/google/falco/Kconfig index e029382..affb14a 100644 --- a/src/mainboard/google/falco/Kconfig +++ b/src/mainboard/google/falco/Kconfig @@ -9,7 +9,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy select INTEL_LYNXPOINT_LP select BOARD_ROMSIZE_KB_8192 select EC_GOOGLE_CHROMEEC - select EC_SOFTWARE_SYNC + select EC_SOFTWARE_SYNC if CHROMEOS select VIRTUAL_DEV_SWITCH select HAVE_ACPI_TABLES select HAVE_OPTION_TABLE @@ -21,8 +21,8 @@ config BOARD_SPECIFIC_OPTIONS # dummy select MAINBOARD_HAS_NATIVE_VGA_INIT select MAINBOARD_DO_NATIVE_VGA_INIT select INTEL_INT15 - select CHROMEOS_VBNV_CMOS - select LID_SWITCH + select CHROMEOS_VBNV_CMOS if CHROMEOS + select LID_SWITCH if CHROMEOS
config MAINBOARD_DIR string diff --git a/src/mainboard/google/foster/Kconfig b/src/mainboard/google/foster/Kconfig index b8fe708..313bb04 100644 --- a/src/mainboard/google/foster/Kconfig +++ b/src/mainboard/google/foster/Kconfig @@ -23,7 +23,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy def_bool y select BOARD_ID_AUTO select BOARD_ROMSIZE_KB_4096 - select CHROMEOS_VBNV_FLASH + select CHROMEOS_VBNV_FLASH if CHROMEOS select SPI_FLASH select SOC_NVIDIA_TEGRA210 select MAINBOARD_HAS_CHROMEOS diff --git a/src/mainboard/google/glados/Kconfig b/src/mainboard/google/glados/Kconfig index c7df2a3..6220400 100644 --- a/src/mainboard/google/glados/Kconfig +++ b/src/mainboard/google/glados/Kconfig @@ -5,24 +5,24 @@ config BOARD_SPECIFIC_OPTIONS # dummy select BOARD_ROMSIZE_KB_16384 select CACHE_ROM select CHROMEOS - select CHROMEOS_RAMOOPS_DYNAMIC - select CHROMEOS_VBNV_CMOS + select CHROMEOS_RAMOOPS_DYNAMIC if CHROMEOS + select CHROMEOS_VBNV_CMOS if CHROMEOS 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 EC_SOFTWARE_SYNC if CHROMEOS select HAVE_ACPI_RESUME select HAVE_ACPI_TABLES select HAVE_OPTION_TABLE select HAVE_SMI_HANDLER - select LID_SWITCH + select LID_SWITCH if CHROMEOS 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 VBOOT_OPROM_MATTERS if CHROMEOS select VIRTUAL_DEV_SWITCH
config IRQ_SLOT_COUNT diff --git a/src/mainboard/google/jecht/Kconfig b/src/mainboard/google/jecht/Kconfig index 83b091d..3b9c7ae 100644 --- a/src/mainboard/google/jecht/Kconfig +++ b/src/mainboard/google/jecht/Kconfig @@ -13,10 +13,10 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_SMI_HANDLER select MAINBOARD_HAS_CHROMEOS select MAINBOARD_HAS_LPC_TPM - select CHROMEOS_RAMOOPS_DYNAMIC + select CHROMEOS_RAMOOPS_DYNAMIC if CHROMEOS select INTEL_INT15 - select CHROMEOS_VBNV_CMOS - select PHYSICAL_REC_SWITCH + select CHROMEOS_VBNV_CMOS if CHROMEOS + select PHYSICAL_REC_SWITCH if CHROMEOS
config MAINBOARD_DIR string diff --git a/src/mainboard/google/link/Kconfig b/src/mainboard/google/link/Kconfig index fd3390a..3d8347a 100644 --- a/src/mainboard/google/link/Kconfig +++ b/src/mainboard/google/link/Kconfig @@ -15,8 +15,8 @@ config BOARD_SPECIFIC_OPTIONS # dummy select MAINBOARD_HAS_LPC_TPM select SERIRQ_CONTINUOUS_MODE select MAINBOARD_HAS_NATIVE_VGA_INIT - select CHROMEOS_VBNV_CMOS - select LID_SWITCH + select CHROMEOS_VBNV_CMOS if CHROMEOS + select LID_SWITCH if CHROMEOS
config MAINBOARD_DIR string diff --git a/src/mainboard/google/nyan/Kconfig b/src/mainboard/google/nyan/Kconfig index d771ca6..ab32e7e 100644 --- a/src/mainboard/google/nyan/Kconfig +++ b/src/mainboard/google/nyan/Kconfig @@ -25,14 +25,14 @@ config BOARD_SPECIFIC_OPTIONS # dummy select MAINBOARD_HAS_CHROMEOS select EC_GOOGLE_CHROMEEC select EC_GOOGLE_CHROMEEC_SPI - select EC_SOFTWARE_SYNC + select EC_SOFTWARE_SYNC if CHROMEOS 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 - select CHROMEOS_VBNV_EC + select CHROMEOS_VBNV_EC if CHROMEOS
config MAINBOARD_DIR string diff --git a/src/mainboard/google/nyan_big/Kconfig b/src/mainboard/google/nyan_big/Kconfig index 55ded30..67c854e 100644 --- a/src/mainboard/google/nyan_big/Kconfig +++ b/src/mainboard/google/nyan_big/Kconfig @@ -26,14 +26,14 @@ config BOARD_SPECIFIC_OPTIONS # dummy select BOARD_ID_AUTO select EC_GOOGLE_CHROMEEC select EC_GOOGLE_CHROMEEC_SPI - select EC_SOFTWARE_SYNC + select EC_SOFTWARE_SYNC if CHROMEOS 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 - select CHROMEOS_VBNV_EC + select CHROMEOS_VBNV_EC if CHROMEOS
config MAINBOARD_DIR string diff --git a/src/mainboard/google/nyan_blaze/Kconfig b/src/mainboard/google/nyan_blaze/Kconfig index 5316523..a19611b 100644 --- a/src/mainboard/google/nyan_blaze/Kconfig +++ b/src/mainboard/google/nyan_blaze/Kconfig @@ -25,7 +25,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy select BOARD_ID_AUTO select EC_GOOGLE_CHROMEEC select EC_GOOGLE_CHROMEEC_SPI - select EC_SOFTWARE_SYNC + select EC_SOFTWARE_SYNC if CHROMEOS select SOC_NVIDIA_TEGRA124 select TEGRA124_MODEL_CD570M select MAINBOARD_HAS_CHROMEOS @@ -34,7 +34,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy select SPI_FLASH select SPI_FLASH_FAST_READ_DUAL_OUTPUT_3B select VIRTUAL_DEV_SWITCH - select CHROMEOS_VBNV_EC + select CHROMEOS_VBNV_EC if CHROMEOS
config MAINBOARD_DIR string diff --git a/src/mainboard/google/panther/Kconfig b/src/mainboard/google/panther/Kconfig index 6fb6c5f..59fd316 100644 --- a/src/mainboard/google/panther/Kconfig +++ b/src/mainboard/google/panther/Kconfig @@ -17,8 +17,8 @@ config BOARD_SPECIFIC_OPTIONS # dummy select MAINBOARD_HAS_CHROMEOS select MAINBOARD_HAS_LPC_TPM select INTEL_INT15 - select PHYSICAL_REC_SWITCH - select CHROMEOS_VBNV_CMOS + select PHYSICAL_REC_SWITCH if CHROMEOS + select CHROMEOS_VBNV_CMOS if CHROMEOS
config MAINBOARD_DIR string diff --git a/src/mainboard/google/parrot/Kconfig b/src/mainboard/google/parrot/Kconfig index 9cf390a..6484dc3 100644 --- a/src/mainboard/google/parrot/Kconfig +++ b/src/mainboard/google/parrot/Kconfig @@ -14,7 +14,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy select MAINBOARD_HAS_CHROMEOS select MAINBOARD_HAS_LPC_TPM select INTEL_INT15 - select CHROMEOS_VBNV_CMOS + select CHROMEOS_VBNV_CMOS if CHROMEOS
# Workaround for EC/KBC IRQ1. select SERIRQ_CONTINUOUS_MODE diff --git a/src/mainboard/google/peach_pit/Kconfig b/src/mainboard/google/peach_pit/Kconfig index 3a94dec..23a5d06 100644 --- a/src/mainboard/google/peach_pit/Kconfig +++ b/src/mainboard/google/peach_pit/Kconfig @@ -28,7 +28,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy select MAINBOARD_HAS_NATIVE_VGA_INIT select MAINBOARD_DO_NATIVE_VGA_INIT select DRIVER_PARADE_PS8625 - select CHROMEOS_VBNV_EC + select CHROMEOS_VBNV_EC if CHROMEOS
config MAINBOARD_DIR string diff --git a/src/mainboard/google/peppy/Kconfig b/src/mainboard/google/peppy/Kconfig index b507953..3594644 100644 --- a/src/mainboard/google/peppy/Kconfig +++ b/src/mainboard/google/peppy/Kconfig @@ -9,7 +9,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy select INTEL_LYNXPOINT_LP select BOARD_ROMSIZE_KB_8192 select EC_GOOGLE_CHROMEEC - select EC_SOFTWARE_SYNC + select EC_SOFTWARE_SYNC if CHROMEOS select VIRTUAL_DEV_SWITCH select HAVE_ACPI_TABLES select HAVE_OPTION_TABLE @@ -23,8 +23,8 @@ config BOARD_SPECIFIC_OPTIONS # dummy select INTEL_DP select INTEL_DDI select INTEL_INT15 - select CHROMEOS_VBNV_CMOS - select LID_SWITCH + select CHROMEOS_VBNV_CMOS if CHROMEOS + select LID_SWITCH if CHROMEOS
config MAINBOARD_DIR string diff --git a/src/mainboard/google/purin/Kconfig b/src/mainboard/google/purin/Kconfig index be6d050..2558a46 100644 --- a/src/mainboard/google/purin/Kconfig +++ b/src/mainboard/google/purin/Kconfig @@ -23,7 +23,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy def_bool y select BOARD_ID_AUTO select BOARD_ROMSIZE_KB_2048 - select CHROMEOS_VBNV_FLASH + select CHROMEOS_VBNV_FLASH if CHROMEOS select COMMON_CBFS_SPI_WRAPPER select HAVE_HARD_RESET select MAINBOARD_HAS_CHROMEOS diff --git a/src/mainboard/google/rambi/Kconfig b/src/mainboard/google/rambi/Kconfig index 45c3ece..27dc04c 100644 --- a/src/mainboard/google/rambi/Kconfig +++ b/src/mainboard/google/rambi/Kconfig @@ -4,7 +4,7 @@ config BOARD_SPECIFIC_OPTIONS def_bool y select SOC_INTEL_BAYTRAIL select EC_GOOGLE_CHROMEEC - select EC_SOFTWARE_SYNC + select EC_SOFTWARE_SYNC if CHROMEOS select VIRTUAL_DEV_SWITCH select ENABLE_BUILTIN_COM1 select BOARD_ROMSIZE_KB_8192 @@ -15,8 +15,8 @@ config BOARD_SPECIFIC_OPTIONS 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 + select CHROMEOS_VBNV_CMOS if CHROMEOS + select LID_SWITCH if CHROMEOS
config MAINBOARD_DIR string diff --git a/src/mainboard/google/rush/Kconfig b/src/mainboard/google/rush/Kconfig index cee8afa..27deefa 100644 --- a/src/mainboard/google/rush/Kconfig +++ b/src/mainboard/google/rush/Kconfig @@ -24,7 +24,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy select BOARD_ID_AUTO select EC_GOOGLE_CHROMEEC select EC_GOOGLE_CHROMEEC_SPI - select EC_SOFTWARE_SYNC + select EC_SOFTWARE_SYNC if CHROMEOS select MAINBOARD_DO_NATIVE_VGA_INIT select SPI_FLASH select SOC_NVIDIA_TEGRA132 @@ -33,7 +33,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy select VIRTUAL_DEV_SWITCH select BOARD_ROMSIZE_KB_4096 select ARM64_USE_SPINTABLE - select CHROMEOS_VBNV_EC + select CHROMEOS_VBNV_EC if CHROMEOS
config MAINBOARD_DIR string diff --git a/src/mainboard/google/rush_ryu/Kconfig b/src/mainboard/google/rush_ryu/Kconfig index a91b9ea..fa8fd00 100644 --- a/src/mainboard/google/rush_ryu/Kconfig +++ b/src/mainboard/google/rush_ryu/Kconfig @@ -25,7 +25,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy select EC_GOOGLE_CHROMEEC select EC_GOOGLE_CHROMEEC_I2C select EC_GOOGLE_CHROMEEC_I2C_PROTO3 - select EC_SOFTWARE_SYNC + select EC_SOFTWARE_SYNC if CHROMEOS select MAINBOARD_DO_NATIVE_VGA_INIT select SPI_FLASH select SOC_NVIDIA_TEGRA132 @@ -34,7 +34,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy select BOARD_ROMSIZE_KB_8192 select VIRTUAL_DEV_SWITCH select ARM64_USE_SPINTABLE - select CHROMEOS_VBNV_EC + select CHROMEOS_VBNV_EC if CHROMEOS
config MAINBOARD_DIR string diff --git a/src/mainboard/google/samus/Kconfig b/src/mainboard/google/samus/Kconfig index 0b4d74d..f845eab 100644 --- a/src/mainboard/google/samus/Kconfig +++ b/src/mainboard/google/samus/Kconfig @@ -5,9 +5,9 @@ config BOARD_SPECIFIC_OPTIONS # dummy 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 EC_SOFTWARE_SYNC if CHROMEOS + select VBOOT_EC_SLOW_UPDATE if CHROMEOS + select VBOOT_OPROM_MATTERS if CHROMEOS select VIRTUAL_DEV_SWITCH select HAVE_ACPI_TABLES select HAVE_OPTION_TABLE @@ -16,10 +16,10 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_SMI_HANDLER select MAINBOARD_HAS_CHROMEOS select MAINBOARD_HAS_LPC_TPM - select CHROMEOS_RAMOOPS_DYNAMIC + select CHROMEOS_RAMOOPS_DYNAMIC if CHROMEOS select INTEL_INT15 - select CHROMEOS_VBNV_CMOS - select LID_SWITCH + select CHROMEOS_VBNV_CMOS if CHROMEOS + select LID_SWITCH if CHROMEOS
config MAINBOARD_DIR string diff --git a/src/mainboard/google/slippy/Kconfig b/src/mainboard/google/slippy/Kconfig index ba83683..26e6b97 100644 --- a/src/mainboard/google/slippy/Kconfig +++ b/src/mainboard/google/slippy/Kconfig @@ -8,7 +8,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy select INTEL_LYNXPOINT_LP select BOARD_ROMSIZE_KB_8192 select EC_GOOGLE_CHROMEEC - select EC_SOFTWARE_SYNC + select EC_SOFTWARE_SYNC if CHROMEOS select VIRTUAL_DEV_SWITCH select HAVE_ACPI_TABLES select HAVE_OPTION_TABLE @@ -20,8 +20,8 @@ config BOARD_SPECIFIC_OPTIONS # dummy select INTEL_DP select INTEL_DDI select INTEL_INT15 - select CHROMEOS_VBNV_CMOS - select LID_SWITCH + select CHROMEOS_VBNV_CMOS if CHROMEOS + select LID_SWITCH if CHROMEOS
config MAINBOARD_DIR string diff --git a/src/mainboard/google/smaug/Kconfig b/src/mainboard/google/smaug/Kconfig index 29dae4f..0a60f1a 100644 --- a/src/mainboard/google/smaug/Kconfig +++ b/src/mainboard/google/smaug/Kconfig @@ -23,12 +23,12 @@ config BOARD_SPECIFIC_OPTIONS # dummy def_bool y select BOARD_ID_AUTO select BOARD_ROMSIZE_KB_16384 - select CHROMEOS_VBNV_FLASH + select CHROMEOS_VBNV_FLASH if CHROMEOS 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 EC_SOFTWARE_SYNC if CHROMEOS select MAINBOARD_DO_NATIVE_VGA_INIT select SPI_FLASH select SPI_FLASH_WINBOND diff --git a/src/mainboard/google/storm/Kconfig b/src/mainboard/google/storm/Kconfig index 55cc5ba..029bbfb 100644 --- a/src/mainboard/google/storm/Kconfig +++ b/src/mainboard/google/storm/Kconfig @@ -31,9 +31,9 @@ config BOARD_SPECIFIC_OPTIONS select SPI_FLASH select SPI_FLASH_SPANSION select SPI_FLASH_STMICRO - select VBOOT_DISABLE_DEV_ON_RECOVERY + select VBOOT_DISABLE_DEV_ON_RECOVERY if CHROMEOS select VIRTUAL_DEV_SWITCH - select WIPEOUT_SUPPORTED + select WIPEOUT_SUPPORTED if CHROMEOS select DRIVERS_UART select CONSOLE_CBMEM_DUMP_TO_UART
diff --git a/src/mainboard/google/stout/Kconfig b/src/mainboard/google/stout/Kconfig index eca83da..b723a96 100644 --- a/src/mainboard/google/stout/Kconfig +++ b/src/mainboard/google/stout/Kconfig @@ -15,7 +15,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy select MAINBOARD_HAS_CHROMEOS select MAINBOARD_HAS_LPC_TPM select INTEL_INT15 - select CHROMEOS_VBNV_CMOS + select CHROMEOS_VBNV_CMOS if CHROMEOS
config MAINBOARD_DIR string diff --git a/src/mainboard/google/veyron_brain/Kconfig b/src/mainboard/google/veyron_brain/Kconfig index e76496b..436248b 100644 --- a/src/mainboard/google/veyron_brain/Kconfig +++ b/src/mainboard/google/veyron_brain/Kconfig @@ -27,14 +27,14 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_HARD_RESET select MAINBOARD_DO_NATIVE_VGA_INIT select MAINBOARD_HAS_CHROMEOS - select PHYSICAL_REC_SWITCH + select PHYSICAL_REC_SWITCH if CHROMEOS select RAM_CODE_SUPPORT select SOC_ROCKCHIP_RK3288 select SPI_FLASH select SPI_FLASH_GIGADEVICE select SPI_FLASH_WINBOND select VIRTUAL_DEV_SWITCH - select CHROMEOS_VBNV_FLASH + select CHROMEOS_VBNV_FLASH if CHROMEOS
config MAINBOARD_DIR string diff --git a/src/mainboard/google/veyron_danger/Kconfig b/src/mainboard/google/veyron_danger/Kconfig index e2128eb..95f9632 100644 --- a/src/mainboard/google/veyron_danger/Kconfig +++ b/src/mainboard/google/veyron_danger/Kconfig @@ -23,12 +23,12 @@ config BOARD_SPECIFIC_OPTIONS # dummy def_bool y select BOARD_ID_AUTO select BOARD_ROMSIZE_KB_4096 - select CHROMEOS_VBNV_FLASH + select CHROMEOS_VBNV_FLASH if CHROMEOS select COMMON_CBFS_SPI_WRAPPER select HAVE_HARD_RESET select MAINBOARD_DO_NATIVE_VGA_INIT select MAINBOARD_HAS_CHROMEOS - select PHYSICAL_REC_SWITCH + select PHYSICAL_REC_SWITCH if CHROMEOS select RAM_CODE_SUPPORT select SOC_ROCKCHIP_RK3288 select SPI_FLASH diff --git a/src/mainboard/google/veyron_jerry/Kconfig b/src/mainboard/google/veyron_jerry/Kconfig index 3e65e67..8f72df6 100644 --- a/src/mainboard/google/veyron_jerry/Kconfig +++ b/src/mainboard/google/veyron_jerry/Kconfig @@ -22,11 +22,11 @@ if BOARD_GOOGLE_VEYRON_JERRY config BOARD_SPECIFIC_OPTIONS # dummy def_bool y select BOARD_ID_AUTO - select CHROMEOS_VBNV_EC + select CHROMEOS_VBNV_EC if CHROMEOS select COMMON_CBFS_SPI_WRAPPER select EC_GOOGLE_CHROMEEC select EC_GOOGLE_CHROMEEC_SPI - select EC_SOFTWARE_SYNC + select EC_SOFTWARE_SYNC if CHROMEOS select RAM_CODE_SUPPORT select SOC_ROCKCHIP_RK3288 select MAINBOARD_DO_NATIVE_VGA_INIT diff --git a/src/mainboard/google/veyron_mickey/Kconfig b/src/mainboard/google/veyron_mickey/Kconfig index 9233a91..cc2abf9 100644 --- a/src/mainboard/google/veyron_mickey/Kconfig +++ b/src/mainboard/google/veyron_mickey/Kconfig @@ -27,14 +27,14 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_HARD_RESET select MAINBOARD_DO_NATIVE_VGA_INIT select MAINBOARD_HAS_CHROMEOS - select PHYSICAL_REC_SWITCH + select PHYSICAL_REC_SWITCH if CHROMEOS select RAM_CODE_SUPPORT select SOC_ROCKCHIP_RK3288 select SPI_FLASH select SPI_FLASH_GIGADEVICE select SPI_FLASH_WINBOND select VIRTUAL_DEV_SWITCH - select CHROMEOS_VBNV_FLASH + select CHROMEOS_VBNV_FLASH if CHROMEOS
config MAINBOARD_DIR string diff --git a/src/mainboard/google/veyron_mighty/Kconfig b/src/mainboard/google/veyron_mighty/Kconfig index 90cdbb5..4dba498 100644 --- a/src/mainboard/google/veyron_mighty/Kconfig +++ b/src/mainboard/google/veyron_mighty/Kconfig @@ -22,11 +22,11 @@ if BOARD_GOOGLE_VEYRON_MIGHTY config BOARD_SPECIFIC_OPTIONS # dummy def_bool y select BOARD_ID_AUTO - select CHROMEOS_VBNV_EC + select CHROMEOS_VBNV_EC if CHROMEOS select COMMON_CBFS_SPI_WRAPPER select EC_GOOGLE_CHROMEEC select EC_GOOGLE_CHROMEEC_SPI - select EC_SOFTWARE_SYNC + select EC_SOFTWARE_SYNC if CHROMEOS select RAM_CODE_SUPPORT select SOC_ROCKCHIP_RK3288 select MAINBOARD_DO_NATIVE_VGA_INIT diff --git a/src/mainboard/google/veyron_minnie/Kconfig b/src/mainboard/google/veyron_minnie/Kconfig index a2d4846..5852e96 100644 --- a/src/mainboard/google/veyron_minnie/Kconfig +++ b/src/mainboard/google/veyron_minnie/Kconfig @@ -23,11 +23,11 @@ config BOARD_SPECIFIC_OPTIONS # dummy def_bool y select BOARD_ID_AUTO select BOARD_ROMSIZE_KB_4096 - select CHROMEOS_VBNV_EC + select CHROMEOS_VBNV_EC if CHROMEOS select COMMON_CBFS_SPI_WRAPPER select EC_GOOGLE_CHROMEEC select EC_GOOGLE_CHROMEEC_SPI - select EC_SOFTWARE_SYNC + select EC_SOFTWARE_SYNC if CHROMEOS select RAM_CODE_SUPPORT select SOC_ROCKCHIP_RK3288 select MAINBOARD_DO_NATIVE_VGA_INIT diff --git a/src/mainboard/google/veyron_pinky/Kconfig b/src/mainboard/google/veyron_pinky/Kconfig index 4b0d471..f67cb45 100644 --- a/src/mainboard/google/veyron_pinky/Kconfig +++ b/src/mainboard/google/veyron_pinky/Kconfig @@ -22,11 +22,11 @@ if BOARD_GOOGLE_VEYRON_PINKY config BOARD_SPECIFIC_OPTIONS # dummy def_bool y select BOARD_ID_AUTO - select CHROMEOS_VBNV_EC + select CHROMEOS_VBNV_EC if CHROMEOS select COMMON_CBFS_SPI_WRAPPER select EC_GOOGLE_CHROMEEC select EC_GOOGLE_CHROMEEC_SPI - select EC_SOFTWARE_SYNC + select EC_SOFTWARE_SYNC if CHROMEOS select RAM_CODE_SUPPORT select SOC_ROCKCHIP_RK3288 select MAINBOARD_DO_NATIVE_VGA_INIT diff --git a/src/mainboard/google/veyron_rialto/Kconfig b/src/mainboard/google/veyron_rialto/Kconfig index 0061bfa..581034d 100644 --- a/src/mainboard/google/veyron_rialto/Kconfig +++ b/src/mainboard/google/veyron_rialto/Kconfig @@ -23,12 +23,12 @@ config BOARD_SPECIFIC_OPTIONS # dummy def_bool y select BOARD_ID_AUTO select BOARD_ROMSIZE_KB_4096 - select CHROMEOS_VBNV_FLASH + select CHROMEOS_VBNV_FLASH if CHROMEOS select COMMON_CBFS_SPI_WRAPPER select HAVE_HARD_RESET select MAINBOARD_DO_NATIVE_VGA_INIT select MAINBOARD_HAS_CHROMEOS - select PHYSICAL_REC_SWITCH + select PHYSICAL_REC_SWITCH if CHROMEOS select RAM_CODE_SUPPORT select SOC_ROCKCHIP_RK3288 select SPI_FLASH diff --git a/src/mainboard/google/veyron_romy/Kconfig b/src/mainboard/google/veyron_romy/Kconfig index b7f05d7..8c69238 100644 --- a/src/mainboard/google/veyron_romy/Kconfig +++ b/src/mainboard/google/veyron_romy/Kconfig @@ -27,14 +27,14 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_HARD_RESET select MAINBOARD_DO_NATIVE_VGA_INIT select MAINBOARD_HAS_CHROMEOS - select PHYSICAL_REC_SWITCH + select PHYSICAL_REC_SWITCH if CHROMEOS select RAM_CODE_SUPPORT select SOC_ROCKCHIP_RK3288 select SPI_FLASH select SPI_FLASH_GIGADEVICE select SPI_FLASH_WINBOND select VIRTUAL_DEV_SWITCH - select CHROMEOS_VBNV_FLASH + select CHROMEOS_VBNV_FLASH if CHROMEOS
config MAINBOARD_DIR string diff --git a/src/mainboard/google/veyron_shark/Kconfig b/src/mainboard/google/veyron_shark/Kconfig index 0cefbc6..0795fb2 100644 --- a/src/mainboard/google/veyron_shark/Kconfig +++ b/src/mainboard/google/veyron_shark/Kconfig @@ -23,11 +23,11 @@ config BOARD_SPECIFIC_OPTIONS # dummy def_bool y select BOARD_ID_AUTO select BOARD_ROMSIZE_KB_4096 - select CHROMEOS_VBNV_EC + select CHROMEOS_VBNV_EC if CHROMEOS select COMMON_CBFS_SPI_WRAPPER select EC_GOOGLE_CHROMEEC select EC_GOOGLE_CHROMEEC_SPI - select EC_SOFTWARE_SYNC + select EC_SOFTWARE_SYNC if CHROMEOS select RAM_CODE_SUPPORT select SOC_ROCKCHIP_RK3288 select MAINBOARD_DO_NATIVE_VGA_INIT diff --git a/src/mainboard/google/veyron_speedy/Kconfig b/src/mainboard/google/veyron_speedy/Kconfig index d4003dc..2aa5d98 100644 --- a/src/mainboard/google/veyron_speedy/Kconfig +++ b/src/mainboard/google/veyron_speedy/Kconfig @@ -23,11 +23,11 @@ config BOARD_SPECIFIC_OPTIONS # dummy def_bool y select BOARD_ID_AUTO select BOARD_ROMSIZE_KB_4096 - select CHROMEOS_VBNV_EC + select CHROMEOS_VBNV_EC if CHROMEOS select COMMON_CBFS_SPI_WRAPPER select EC_GOOGLE_CHROMEEC select EC_GOOGLE_CHROMEEC_SPI - select EC_SOFTWARE_SYNC + select EC_SOFTWARE_SYNC if CHROMEOS select RAM_CODE_SUPPORT select SOC_ROCKCHIP_RK3288 select MAINBOARD_DO_NATIVE_VGA_INIT diff --git a/src/mainboard/intel/baskingridge/Kconfig b/src/mainboard/intel/baskingridge/Kconfig index f916138..58649e0 100644 --- a/src/mainboard/intel/baskingridge/Kconfig +++ b/src/mainboard/intel/baskingridge/Kconfig @@ -13,7 +13,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy select MAINBOARD_HAS_CHROMEOS select MAINBOARD_HAS_LPC_TPM select INTEL_INT15 - select CHROMEOS_VBNV_CMOS + select CHROMEOS_VBNV_CMOS if CHROMEOS
config MAINBOARD_DIR string diff --git a/src/mainboard/intel/emeraldlake2/Kconfig b/src/mainboard/intel/emeraldlake2/Kconfig index 74b8270..f31a3bc 100644 --- a/src/mainboard/intel/emeraldlake2/Kconfig +++ b/src/mainboard/intel/emeraldlake2/Kconfig @@ -12,7 +12,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_ACPI_RESUME select INTEL_INT15 #select MAINBOARD_HAS_CHROMEOS - #select CHROMEOS_VBNV_CMOS + #select CHROMEOS_VBNV_CMOS if CHROMEOS
config MAINBOARD_DIR string diff --git a/src/mainboard/intel/kunimitsu/Kconfig b/src/mainboard/intel/kunimitsu/Kconfig index 78d4081..ae7cd7f 100644 --- a/src/mainboard/intel/kunimitsu/Kconfig +++ b/src/mainboard/intel/kunimitsu/Kconfig @@ -5,8 +5,8 @@ config BOARD_SPECIFIC_OPTIONS # dummy select BOARD_ROMSIZE_KB_16384 select CACHE_ROM select CHROMEOS - select CHROMEOS_RAMOOPS_DYNAMIC - select CHROMEOS_VBNV_CMOS + select CHROMEOS_RAMOOPS_DYNAMIC if CHROMEOS + select CHROMEOS_VBNV_CMOS if CHROMEOS select EC_GOOGLE_CHROMEEC select EC_GOOGLE_CHROMEEC_LPC select EC_GOOGLE_CHROMEEC_MEC @@ -15,13 +15,13 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_ACPI_TABLES select HAVE_OPTION_TABLE select HAVE_SMI_HANDLER - select LID_SWITCH + select LID_SWITCH if CHROMEOS 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 VBOOT_OPROM_MATTERS if CHROMEOS select VIRTUAL_DEV_SWITCH
config IRQ_SLOT_COUNT diff --git a/src/mainboard/intel/sklrvp/Kconfig b/src/mainboard/intel/sklrvp/Kconfig index 601efb0..48a39a7 100644 --- a/src/mainboard/intel/sklrvp/Kconfig +++ b/src/mainboard/intel/sklrvp/Kconfig @@ -5,8 +5,8 @@ config BOARD_SPECIFIC_OPTIONS # dummy select BOARD_ROMSIZE_KB_16384 select CACHE_ROM select CHROMEOS - select CHROMEOS_RAMOOPS_DYNAMIC - select CHROMEOS_VBNV_CMOS + select CHROMEOS_RAMOOPS_DYNAMIC if CHROMEOS + select CHROMEOS_VBNV_CMOS if CHROMEOS select HAVE_ACPI_RESUME select HAVE_ACPI_TABLES select HAVE_OPTION_TABLE @@ -19,7 +19,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy select SOC_INTEL_SKYLAKE select VBOOT_DYNAMIC_WORK_BUFFER select VIRTUAL_DEV_SWITCH - select LID_SWITCH + select LID_SWITCH if CHROMEOS
config IRQ_SLOT_COUNT int diff --git a/src/mainboard/intel/strago/Kconfig b/src/mainboard/intel/strago/Kconfig index c19761a..94924b2 100755 --- a/src/mainboard/intel/strago/Kconfig +++ b/src/mainboard/intel/strago/Kconfig @@ -6,11 +6,11 @@ config BOARD_SPECIFIC_OPTIONS select ALWAYS_LOAD_OPROM if !PAYLOAD_SEABIOS select BOARD_ROMSIZE_KB_8192 select CHROMEOS - select CHROMEOS_VBNV_CMOS + select CHROMEOS_VBNV_CMOS if CHROMEOS select EC_GOOGLE_CHROMEEC select EC_GOOGLE_CHROMEEC_MEC select EC_GOOGLE_CHROMEEC_ACPI_MEMMAP - select EC_SOFTWARE_SYNC + select EC_SOFTWARE_SYNC if CHROMEOS select ENABLE_BUILTIN_COM1 select HAVE_ACPI_RESUME select HAVE_ACPI_TABLES @@ -20,7 +20,7 @@ config BOARD_SPECIFIC_OPTIONS select SOC_INTEL_BRASWELL select VBOOT_DYNAMIC_WORK_BUFFER select VIRTUAL_DEV_SWITCH - select LID_SWITCH + select LID_SWITCH if CHROMEOS
config DISPLAY_SPD_DATA diff --git a/src/mainboard/intel/wtm2/Kconfig b/src/mainboard/intel/wtm2/Kconfig index b8f616a..d2a00b8 100644 --- a/src/mainboard/intel/wtm2/Kconfig +++ b/src/mainboard/intel/wtm2/Kconfig @@ -13,8 +13,8 @@ config BOARD_SPECIFIC_OPTIONS # dummy select MAINBOARD_HAS_NATIVE_VGA_INIT select INTEL_INT15
- select CHROMEOS_RAMOOPS_DYNAMIC - select CHROMEOS_VBNV_CMOS + select CHROMEOS_RAMOOPS_DYNAMIC if CHROMEOS + select CHROMEOS_VBNV_CMOS if CHROMEOS
config MAINBOARD_DIR string diff --git a/src/mainboard/samsung/lumpy/Kconfig b/src/mainboard/samsung/lumpy/Kconfig index fed4610..78d1aa3 100644 --- a/src/mainboard/samsung/lumpy/Kconfig +++ b/src/mainboard/samsung/lumpy/Kconfig @@ -20,7 +20,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy select DRIVERS_GENERIC_IOAPIC select INTEL_INT15 select HAVE_MRC - select CHROMEOS_VBNV_CMOS + select CHROMEOS_VBNV_CMOS if CHROMEOS
config MAINBOARD_DIR string diff --git a/src/mainboard/samsung/stumpy/Kconfig b/src/mainboard/samsung/stumpy/Kconfig index f749c39..5ed5a4d 100644 --- a/src/mainboard/samsung/stumpy/Kconfig +++ b/src/mainboard/samsung/stumpy/Kconfig @@ -12,12 +12,12 @@ config BOARD_SPECIFIC_OPTIONS # dummy select NORTHBRIDGE_INTEL_SANDYBRIDGE select SOUTHBRIDGE_INTEL_BD82X6X select SUPERIO_ITE_IT8772F - select PHYSICAL_REC_SWITCH + select PHYSICAL_REC_SWITCH if CHROMEOS # LPC47N207 selected for external LPC card # not on board, should be made selectable. select SUPERIO_SMSC_LPC47N207 select HAVE_MRC - select CHROMEOS_VBNV_CMOS + select CHROMEOS_VBNV_CMOS if CHROMEOS
select INTEL_INT15 config MAINBOARD_DIR diff --git a/src/soc/broadcom/cygnus/Kconfig b/src/soc/broadcom/cygnus/Kconfig index 7ab305c..33fe752 100644 --- a/src/soc/broadcom/cygnus/Kconfig +++ b/src/soc/broadcom/cygnus/Kconfig @@ -29,8 +29,8 @@ config SOC_BROADCOM_CYGNUS select HAVE_MONOTONIC_TIMER select HAVE_UART_SPECIAL select HAS_PRECBMEM_TIMESTAMP_REGION - select SEPARATE_VERSTAGE - select RETURN_FROM_VERSTAGE + select SEPARATE_VERSTAGE if CHROMEOS + select RETURN_FROM_VERSTAGE if CHROMEOS select GENERIC_GPIO_LIB
if SOC_BROADCOM_CYGNUS diff --git a/src/soc/marvell/bg4cd/Kconfig b/src/soc/marvell/bg4cd/Kconfig index 930645e..1002781 100644 --- a/src/soc/marvell/bg4cd/Kconfig +++ b/src/soc/marvell/bg4cd/Kconfig @@ -29,7 +29,7 @@ config SOC_MARVELL_BG4CD select GENERIC_UDELAY select HAVE_MONOTONIC_TIMER select GENERIC_GPIO_LIB - select VBOOT_STARTS_IN_BOOTBLOCK + select VBOOT_STARTS_IN_BOOTBLOCK if CHROMEOS
if SOC_MARVELL_BG4CD
diff --git a/src/soc/nvidia/tegra210/Kconfig b/src/soc/nvidia/tegra210/Kconfig index 7aff588..20dd3fc 100644 --- a/src/soc/nvidia/tegra210/Kconfig +++ b/src/soc/nvidia/tegra210/Kconfig @@ -16,7 +16,7 @@ config SOC_NVIDIA_TEGRA210 select ARM_BOOTBLOCK_CUSTOM select ARM64_USE_ARM_TRUSTED_FIRMWARE select HAS_PRECBMEM_TIMESTAMP_REGION - select CHROMEOS_RAMOOPS_NON_ACPI + select CHROMEOS_RAMOOPS_NON_ACPI if CHROMEOS select GENERIC_GPIO_LIB
if SOC_NVIDIA_TEGRA210 diff --git a/src/soc/qualcomm/ipq806x/Kconfig b/src/soc/qualcomm/ipq806x/Kconfig index 9a1e4f9..1abc309 100644 --- a/src/soc/qualcomm/ipq806x/Kconfig +++ b/src/soc/qualcomm/ipq806x/Kconfig @@ -6,13 +6,13 @@ config SOC_QC_IPQ806X select ARCH_ROMSTAGE_ARMV7 select ARCH_RAMSTAGE_ARMV7 select BOOTBLOCK_CONSOLE - select CHROMEOS_VBNV_FLASH + select CHROMEOS_VBNV_FLASH if CHROMEOS select HAS_PRECBMEM_TIMESTAMP_REGION select HAVE_UART_SPECIAL select SPI_ATOMIC_SEQUENCING select GENERIC_GPIO_LIB - select SEPARATE_VERSTAGE - select RETURN_FROM_VERSTAGE + select SEPARATE_VERSTAGE if CHROMEOS + select RETURN_FROM_VERSTAGE if CHROMEOS
if SOC_QC_IPQ806X
diff --git a/src/soc/rockchip/rk3288/Kconfig b/src/soc/rockchip/rk3288/Kconfig index 1800b16..6fa4426 100644 --- a/src/soc/rockchip/rk3288/Kconfig +++ b/src/soc/rockchip/rk3288/Kconfig @@ -32,9 +32,9 @@ config SOC_ROCKCHIP_RK3288 select UNCOMPRESSED_RAMSTAGE select GENERIC_GPIO_LIB select RTC - select VBOOT_STARTS_IN_BOOTBLOCK - select SEPARATE_VERSTAGE - select RETURN_FROM_VERSTAGE + select VBOOT_STARTS_IN_BOOTBLOCK if CHROMEOS + select SEPARATE_VERSTAGE if CHROMEOS + select RETURN_FROM_VERSTAGE if CHROMEOS
if SOC_ROCKCHIP_RK3288