[coreboot-gerrit] Patch set updated for coreboot: apollolake: Move CHROMEOS config to SoC

[Furquan Shaikh (furquan@google.com)]

Furquan Shaikh (furquan at google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/15821

-gerrit

commit 3fff6d67765df71aac10f1f33f1a1726114aa6fd
Author: Furquan Shaikh <furquan at google.com>
Date:   Fri Jul 22 12:57:51 2016 -0700

    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
    
    Change-Id: I2d54ff6beac9fca7596a8f104e3c1447cada5c05
    Signed-off-by: Furquan Shaikh <furquan at google.com>
---
 src/mainboard/google/reef/Kconfig  | 12 +-----------
 src/mainboard/intel/amenia/Kconfig |  6 +-----
 src/soc/intel/apollolake/Kconfig   | 11 +++++++++++
 3 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/src/mainboard/google/reef/Kconfig b/src/mainboard/google/reef/Kconfig
index 42019c7..ea9f831 100644
--- a/src/mainboard/google/reef/Kconfig
+++ b/src/mainboard/google/reef/Kconfig
@@ -8,6 +8,7 @@ config BOARD_SPECIFIC_OPTIONS
 	select EC_GOOGLE_CHROMEEC_LPC
 	select HAVE_ACPI_RESUME
 	select HAVE_ACPI_TABLES
+	select LID_SWITCH
 	select MAINBOARD_HAS_CHROMEOS
 	select MAINBOARD_HAS_LPC_TPM
 	select SYSTEM_TYPE_LAPTOP
@@ -16,17 +17,6 @@ config BOOT_MEDIA_SPI_BUS
 	int
 	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 dd04a6f..dcb48fa 100644
--- a/src/mainboard/intel/amenia/Kconfig
+++ b/src/mainboard/intel/amenia/Kconfig
@@ -11,15 +11,11 @@ config BOARD_SPECIFIC_OPTIONS
 	select HAVE_ACPI_TABLES
 	select MAINBOARD_HAS_LPC_TPM
 	select HAVE_ACPI_RESUME
+	select LID_SWITCH
 	select MAINBOARD_HAS_CHROMEOS
 	select SYSTEM_TYPE_LAPTOP
 	select TPM_ON_FAST_SPI
 
-config CHROMEOS
-	bool
-	default y
-	select VIRTUAL_DEV_SWITCH
-
 config MAINBOARD_DIR
 	string
 	default intel/amenia
diff --git a/src/soc/intel/apollolake/Kconfig b/src/soc/intel/apollolake/Kconfig
index d36fc06..25a256f 100644
--- a/src/soc/intel/apollolake/Kconfig
+++ b/src/soc/intel/apollolake/Kconfig
@@ -57,6 +57,17 @@ config CPU_SPECIFIC_OPTIONS
 	select SOC_INTEL_COMMON_GFX_OPREGION
 	select ADD_VBT_DATA_FILE
 
+config CHROMEOS
+	depends on MAINBOARD_HAS_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