From 17340e74e761fa5a9b05f167a315b742cec5341f Mon Sep 17 00:00:00 2001 From: Furquan Shaikh Date: Fri, 22 Jul 2016 12:57:51 -0700 Subject: [PATCH] UPSTREAM: apollolake: Move CHROMEOS config to SoC All the mainboards share the same config options for CHROMEOS. Instead of duplicating those in every mainboard, move the CHROMEOS config to SoC and make it dependent on MAINBOARD_HAS_CHROMEOS. BUG=chrome-os-partner:55431 BRANCH=None TEST=None Signed-off-by: Furquan Shaikh Reviewed-on: https://review.coreboot.org/15821 Reviewed-by: Aaron Durbin Tested-by: build bot (Jenkins) Change-Id: I2d54ff6beac9fca7596a8f104e3c1447cada5c05 Reviewed-on: https://chromium-review.googlesource.com/362879 Commit-Ready: Furquan Shaikh Tested-by: Furquan Shaikh Reviewed-by: Aaron Durbin --- src/mainboard/google/reef/Kconfig | 8 -------- src/mainboard/intel/amenia/Kconfig | 4 +--- src/soc/intel/apollolake/Kconfig | 10 ++++++++++ 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/mainboard/google/reef/Kconfig b/src/mainboard/google/reef/Kconfig index 42019c79f6..5fafa8baf7 100644 --- a/src/mainboard/google/reef/Kconfig +++ b/src/mainboard/google/reef/Kconfig @@ -17,15 +17,7 @@ config BOOT_MEDIA_SPI_BUS default 0 config CHROMEOS - select CHROMEOS_RAMOOPS_DYNAMIC - select CHROMEOS_VBNV_CMOS - select CHROMEOS_VBNV_CMOS_BACKUP_TO_FLASH - select EC_SOFTWARE_SYNC select LID_SWITCH - select SEPARATE_VERSTAGE - select VBOOT_OPROM_MATTERS - select VBOOT_STARTS_IN_BOOTBLOCK - select VIRTUAL_DEV_SWITCH config DRIVERS_I2C_DA7219 default y diff --git a/src/mainboard/intel/amenia/Kconfig b/src/mainboard/intel/amenia/Kconfig index 42eb259e97..477d90e468 100644 --- a/src/mainboard/intel/amenia/Kconfig +++ b/src/mainboard/intel/amenia/Kconfig @@ -16,9 +16,7 @@ config BOARD_SPECIFIC_OPTIONS select TPM_ON_FAST_SPI config CHROMEOS - bool - default y - select VIRTUAL_DEV_SWITCH + select LID_SWITCH config CHROMEOS select EC_SOFTWARE_SYNC diff --git a/src/soc/intel/apollolake/Kconfig b/src/soc/intel/apollolake/Kconfig index d36fc064db..b013da15c2 100644 --- a/src/soc/intel/apollolake/Kconfig +++ b/src/soc/intel/apollolake/Kconfig @@ -57,6 +57,16 @@ config CPU_SPECIFIC_OPTIONS select SOC_INTEL_COMMON_GFX_OPREGION select ADD_VBT_DATA_FILE +config CHROMEOS + select CHROMEOS_RAMOOPS_DYNAMIC + select CHROMEOS_VBNV_CMOS + select CHROMEOS_VBNV_CMOS_BACKUP_TO_FLASH + select EC_SOFTWARE_SYNC if EC_GOOGLE_CHROMEEC + select SEPARATE_VERSTAGE + select VBOOT_OPROM_MATTERS + select VBOOT_STARTS_IN_BOOTBLOCK + select VIRTUAL_DEV_SWITCH + config TPM_ON_FAST_SPI bool default n