From 967cd9a02741487e26e4301d201f4eb9c34e383c Mon Sep 17 00:00:00 2001 From: Martin Roth Date: Tue, 18 Aug 2015 14:22:58 -0600 Subject: 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 Reviewed-on: http://review.coreboot.org/11272 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin --- src/mainboard/google/auron/Kconfig | 6 ++++-- src/mainboard/google/bolt/Kconfig | 4 +++- src/mainboard/google/butterfly/Kconfig | 6 +++--- src/mainboard/google/cosmos/Kconfig | 4 +++- src/mainboard/google/cyan/Kconfig | 6 ++++-- src/mainboard/google/daisy/Kconfig | 2 ++ src/mainboard/google/falco/Kconfig | 4 +++- src/mainboard/google/foster/Kconfig | 4 +++- src/mainboard/google/glados/Kconfig | 12 +++++++----- src/mainboard/google/jecht/Kconfig | 4 +++- src/mainboard/google/link/Kconfig | 2 ++ 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 | 2 ++ src/mainboard/google/parrot/Kconfig | 2 ++ src/mainboard/google/peach_pit/Kconfig | 2 ++ src/mainboard/google/peppy/Kconfig | 4 +++- src/mainboard/google/purin/Kconfig | 4 +++- src/mainboard/google/rambi/Kconfig | 4 +++- src/mainboard/google/rush/Kconfig | 4 +++- src/mainboard/google/rush_ryu/Kconfig | 4 +++- src/mainboard/google/samus/Kconfig | 10 ++++++---- src/mainboard/google/slippy/Kconfig | 4 +++- src/mainboard/google/smaug/Kconfig | 6 ++++-- src/mainboard/google/storm/Kconfig | 6 ++++-- src/mainboard/google/stout/Kconfig | 2 ++ src/mainboard/google/veyron_brain/Kconfig | 4 +++- src/mainboard/google/veyron_danger/Kconfig | 6 ++++-- src/mainboard/google/veyron_jerry/Kconfig | 6 ++++-- src/mainboard/google/veyron_mickey/Kconfig | 4 +++- src/mainboard/google/veyron_mighty/Kconfig | 6 ++++-- src/mainboard/google/veyron_minnie/Kconfig | 6 ++++-- src/mainboard/google/veyron_pinky/Kconfig | 6 ++++-- src/mainboard/google/veyron_rialto/Kconfig | 6 ++++-- src/mainboard/google/veyron_romy/Kconfig | 4 +++- src/mainboard/google/veyron_shark/Kconfig | 6 ++++-- src/mainboard/google/veyron_speedy/Kconfig | 6 ++++-- 38 files changed, 127 insertions(+), 53 deletions(-) (limited to 'src/mainboard/google') diff --git a/src/mainboard/google/auron/Kconfig b/src/mainboard/google/auron/Kconfig index 3a4cb7e42a..7ad3eaa148 100644 --- a/src/mainboard/google/auron/Kconfig +++ b/src/mainboard/google/auron/Kconfig @@ -5,7 +5,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy 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 @@ config BOARD_SPECIFIC_OPTIONS # dummy 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 2e37e2512d..0599d1584b 100644 --- a/src/mainboard/google/bolt/Kconfig +++ b/src/mainboard/google/bolt/Kconfig @@ -8,7 +8,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy 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 @@ config BOARD_SPECIFIC_OPTIONS # dummy 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 b1a64eebad..0c37565145 100644 --- a/src/mainboard/google/butterfly/Kconfig +++ b/src/mainboard/google/butterfly/Kconfig @@ -15,10 +15,10 @@ config BOARD_SPECIFIC_OPTIONS # dummy 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 a6c87b1ae5..70a5e09253 100644 --- a/src/mainboard/google/cosmos/Kconfig +++ b/src/mainboard/google/cosmos/Kconfig @@ -23,7 +23,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy 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 @@ config BOARD_SPECIFIC_OPTIONS # dummy 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 094c629881..5bb0e4ea76 100644 --- a/src/mainboard/google/cyan/Kconfig +++ b/src/mainboard/google/cyan/Kconfig @@ -5,11 +5,9 @@ config BOARD_SPECIFIC_OPTIONS 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 @@ config BOARD_SPECIFIC_OPTIONS 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 c69c390029..5c3b643882 100644 --- a/src/mainboard/google/daisy/Kconfig +++ b/src/mainboard/google/daisy/Kconfig @@ -30,6 +30,8 @@ config BOARD_SPECIFIC_OPTIONS # dummy 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 e029382a25..cbcd57d3c0 100644 --- a/src/mainboard/google/falco/Kconfig +++ b/src/mainboard/google/falco/Kconfig @@ -9,7 +9,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy 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 @@ config BOARD_SPECIFIC_OPTIONS # dummy 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 b8fe708be3..373cb079a1 100644 --- a/src/mainboard/google/foster/Kconfig +++ b/src/mainboard/google/foster/Kconfig @@ -23,7 +23,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy 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 @@ config BOARD_SPECIFIC_OPTIONS # dummy 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 d91aca5618..767b5135d3 100644 --- a/src/mainboard/google/glados/Kconfig +++ b/src/mainboard/google/glados/Kconfig @@ -4,26 +4,28 @@ config BOARD_SPECIFIC_OPTIONS # dummy 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 83b091db29..90e9cea74f 100644 --- a/src/mainboard/google/jecht/Kconfig +++ b/src/mainboard/google/jecht/Kconfig @@ -13,10 +13,12 @@ config BOARD_SPECIFIC_OPTIONS # dummy 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 fd3390ad47..ac06a6226b 100644 --- a/src/mainboard/google/link/Kconfig +++ b/src/mainboard/google/link/Kconfig @@ -15,6 +15,8 @@ config BOARD_SPECIFIC_OPTIONS # dummy 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 d771ca6fac..bd390e43a9 100644 --- a/src/mainboard/google/nyan/Kconfig +++ b/src/mainboard/google/nyan/Kconfig @@ -25,14 +25,16 @@ config BOARD_SPECIFIC_OPTIONS # dummy 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 55ded30551..e187a665bb 100644 --- a/src/mainboard/google/nyan_big/Kconfig +++ b/src/mainboard/google/nyan_big/Kconfig @@ -26,13 +26,15 @@ config BOARD_SPECIFIC_OPTIONS # dummy 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 53165231f6..29191f2424 100644 --- a/src/mainboard/google/nyan_blaze/Kconfig +++ b/src/mainboard/google/nyan_blaze/Kconfig @@ -25,7 +25,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy 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 @@ config BOARD_SPECIFIC_OPTIONS # dummy 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 6fb6c5ffca..85bc1ffe6c 100644 --- a/src/mainboard/google/panther/Kconfig +++ b/src/mainboard/google/panther/Kconfig @@ -17,6 +17,8 @@ config BOARD_SPECIFIC_OPTIONS # dummy 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 9cf390ac79..56ebf86fb9 100644 --- a/src/mainboard/google/parrot/Kconfig +++ b/src/mainboard/google/parrot/Kconfig @@ -14,6 +14,8 @@ config BOARD_SPECIFIC_OPTIONS # dummy 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 3a94decc64..016ecb9e91 100644 --- a/src/mainboard/google/peach_pit/Kconfig +++ b/src/mainboard/google/peach_pit/Kconfig @@ -28,6 +28,8 @@ config BOARD_SPECIFIC_OPTIONS # dummy 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 b507953223..66203ce505 100644 --- a/src/mainboard/google/peppy/Kconfig +++ b/src/mainboard/google/peppy/Kconfig @@ -9,7 +9,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy 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 @@ config BOARD_SPECIFIC_OPTIONS # dummy 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 be6d050eea..67aaca5f87 100644 --- a/src/mainboard/google/purin/Kconfig +++ b/src/mainboard/google/purin/Kconfig @@ -23,7 +23,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy 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 @@ config BOARD_SPECIFIC_OPTIONS # dummy 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 45c3ecea22..94596750ac 100644 --- a/src/mainboard/google/rambi/Kconfig +++ b/src/mainboard/google/rambi/Kconfig @@ -4,7 +4,6 @@ config BOARD_SPECIFIC_OPTIONS 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 @@ config BOARD_SPECIFIC_OPTIONS 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 cee8afaf6f..573bff9bcc 100644 --- a/src/mainboard/google/rush/Kconfig +++ b/src/mainboard/google/rush/Kconfig @@ -24,7 +24,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy 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 @@ config BOARD_SPECIFIC_OPTIONS # dummy 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 a91b9eaed3..6205f2d34d 100644 --- a/src/mainboard/google/rush_ryu/Kconfig +++ b/src/mainboard/google/rush_ryu/Kconfig @@ -25,7 +25,6 @@ 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 MAINBOARD_DO_NATIVE_VGA_INIT select SPI_FLASH select SOC_NVIDIA_TEGRA132 @@ -34,7 +33,10 @@ config BOARD_SPECIFIC_OPTIONS # dummy 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 0b4d74d0ad..e45b22f1df 100644 --- a/src/mainboard/google/samus/Kconfig +++ b/src/mainboard/google/samus/Kconfig @@ -5,9 +5,6 @@ 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 VIRTUAL_DEV_SWITCH select HAVE_ACPI_TABLES select HAVE_OPTION_TABLE @@ -16,10 +13,15 @@ config BOARD_SPECIFIC_OPTIONS # dummy 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 ba83683bb7..8f9f518a71 100644 --- a/src/mainboard/google/slippy/Kconfig +++ b/src/mainboard/google/slippy/Kconfig @@ -8,7 +8,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy 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 @@ config BOARD_SPECIFIC_OPTIONS # dummy 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 29dae4fbd9..0fe9f68d0d 100644 --- a/src/mainboard/google/smaug/Kconfig +++ b/src/mainboard/google/smaug/Kconfig @@ -23,12 +23,10 @@ config BOARD_SPECIFIC_OPTIONS # dummy 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 @@ config BOARD_SPECIFIC_OPTIONS # dummy 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 55cc5ba59b..404ab4d41d 100644 --- a/src/mainboard/google/storm/Kconfig +++ b/src/mainboard/google/storm/Kconfig @@ -31,12 +31,14 @@ config BOARD_SPECIFIC_OPTIONS 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 eca83da637..3f73295b22 100644 --- a/src/mainboard/google/stout/Kconfig +++ b/src/mainboard/google/stout/Kconfig @@ -15,6 +15,8 @@ config BOARD_SPECIFIC_OPTIONS # dummy 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 e76496b5a4..eb70f3a3c9 100644 --- a/src/mainboard/google/veyron_brain/Kconfig +++ b/src/mainboard/google/veyron_brain/Kconfig @@ -27,14 +27,16 @@ config BOARD_SPECIFIC_OPTIONS # dummy 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 e2128eba7a..816004668e 100644 --- a/src/mainboard/google/veyron_danger/Kconfig +++ b/src/mainboard/google/veyron_danger/Kconfig @@ -23,18 +23,20 @@ config BOARD_SPECIFIC_OPTIONS # dummy 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 3e65e67476..566e0a9bab 100644 --- a/src/mainboard/google/veyron_jerry/Kconfig +++ b/src/mainboard/google/veyron_jerry/Kconfig @@ -22,11 +22,9 @@ if BOARD_GOOGLE_VEYRON_JERRY 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 @@ config BOARD_SPECIFIC_OPTIONS # dummy 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 9233a91b29..3c90dcc9e6 100644 --- a/src/mainboard/google/veyron_mickey/Kconfig +++ b/src/mainboard/google/veyron_mickey/Kconfig @@ -27,14 +27,16 @@ config BOARD_SPECIFIC_OPTIONS # dummy 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 90cdbb564d..8d22da79f5 100644 --- a/src/mainboard/google/veyron_mighty/Kconfig +++ b/src/mainboard/google/veyron_mighty/Kconfig @@ -22,11 +22,9 @@ if BOARD_GOOGLE_VEYRON_MIGHTY 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 @@ config BOARD_SPECIFIC_OPTIONS # dummy 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 a2d48469d8..930a1ba4b1 100644 --- a/src/mainboard/google/veyron_minnie/Kconfig +++ b/src/mainboard/google/veyron_minnie/Kconfig @@ -23,11 +23,9 @@ config BOARD_SPECIFIC_OPTIONS # dummy 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 @@ config BOARD_SPECIFIC_OPTIONS # dummy 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 4b0d47122a..818b5256f2 100644 --- a/src/mainboard/google/veyron_pinky/Kconfig +++ b/src/mainboard/google/veyron_pinky/Kconfig @@ -22,11 +22,9 @@ if BOARD_GOOGLE_VEYRON_PINKY 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 @@ config BOARD_SPECIFIC_OPTIONS # dummy 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 0061bfadc9..a03818433e 100644 --- a/src/mainboard/google/veyron_rialto/Kconfig +++ b/src/mainboard/google/veyron_rialto/Kconfig @@ -23,12 +23,10 @@ config BOARD_SPECIFIC_OPTIONS # dummy 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 @@ config BOARD_SPECIFIC_OPTIONS # dummy 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 b7f05d77c2..1570cee597 100644 --- a/src/mainboard/google/veyron_romy/Kconfig +++ b/src/mainboard/google/veyron_romy/Kconfig @@ -27,14 +27,16 @@ config BOARD_SPECIFIC_OPTIONS # dummy 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 0cefbc6d4c..01068bfa31 100644 --- a/src/mainboard/google/veyron_shark/Kconfig +++ b/src/mainboard/google/veyron_shark/Kconfig @@ -23,11 +23,9 @@ config BOARD_SPECIFIC_OPTIONS # dummy 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 @@ config BOARD_SPECIFIC_OPTIONS # dummy 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 d4003dc4bb..882571c02c 100644 --- a/src/mainboard/google/veyron_speedy/Kconfig +++ b/src/mainboard/google/veyron_speedy/Kconfig @@ -23,11 +23,9 @@ config BOARD_SPECIFIC_OPTIONS # dummy 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 @@ config BOARD_SPECIFIC_OPTIONS # dummy 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 -- cgit v1.2.3