[coreboot-gerrit] Patch set updated for coreboot: skylake: 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/15822

-gerrit

commit 4eae57ac1f45be94fa1a0ec4e5d50e1ad3cd8d47
Author: Furquan Shaikh <furquan at google.com>
Date:   Fri Jul 22 16:17:53 2016 -0700

    skylake: 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: Iafabb6373dfe16aaf0fe2cbc4e978952adeb403e
    Signed-off-by: Furquan Shaikh <furquan at google.com>
---
 src/mainboard/google/chell/Kconfig    |  7 -------
 src/mainboard/google/glados/Kconfig   |  7 -------
 src/mainboard/google/lars/Kconfig     |  7 -------
 src/mainboard/intel/kunimitsu/Kconfig |  7 -------
 src/soc/intel/skylake/Kconfig         | 10 ++++++++++
 5 files changed, 10 insertions(+), 28 deletions(-)

diff --git a/src/mainboard/google/chell/Kconfig b/src/mainboard/google/chell/Kconfig
index 95102b6..5ed211a 100644
--- a/src/mainboard/google/chell/Kconfig
+++ b/src/mainboard/google/chell/Kconfig
@@ -20,14 +20,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select SOC_INTEL_SKYLAKE
 
 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 VBOOT_EC_SLOW_UPDATE
-	select VBOOT_OPROM_MATTERS
-	select VIRTUAL_DEV_SWITCH
 
 config DRIVERS_I2C_GENERIC
 	def_bool y
diff --git a/src/mainboard/google/glados/Kconfig b/src/mainboard/google/glados/Kconfig
index abe5fa8..3acb8e9 100644
--- a/src/mainboard/google/glados/Kconfig
+++ b/src/mainboard/google/glados/Kconfig
@@ -20,14 +20,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select SOC_INTEL_SKYLAKE
 
 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 VBOOT_EC_SLOW_UPDATE
-	select VBOOT_OPROM_MATTERS
-	select VIRTUAL_DEV_SWITCH
 
 config DRIVERS_I2C_GENERIC
 	def_bool y
diff --git a/src/mainboard/google/lars/Kconfig b/src/mainboard/google/lars/Kconfig
index ee08067..c602523 100644
--- a/src/mainboard/google/lars/Kconfig
+++ b/src/mainboard/google/lars/Kconfig
@@ -21,14 +21,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select SOC_INTEL_SKYLAKE
 
 config CHROMEOS
-	select CHROMEOS_RAMOOPS_DYNAMIC
-	select CHROMEOS_VBNV_CMOS
-	select CHROMEOS_VBNV_CMOS_BACKUP_TO_FLASH
 	select LID_SWITCH
-	select VBOOT_EC_SLOW_UPDATE
-	select VBOOT_OPROM_MATTERS
-	select VIRTUAL_DEV_SWITCH
-	select EC_SOFTWARE_SYNC
 
 config DRIVERS_GENERIC_MAX98357A
 	default y
diff --git a/src/mainboard/intel/kunimitsu/Kconfig b/src/mainboard/intel/kunimitsu/Kconfig
index 85b568e..d2e6951 100644
--- a/src/mainboard/intel/kunimitsu/Kconfig
+++ b/src/mainboard/intel/kunimitsu/Kconfig
@@ -20,14 +20,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select SOC_INTEL_SKYLAKE
 
 config CHROMEOS
-	select CHROMEOS_RAMOOPS_DYNAMIC
-	select CHROMEOS_VBNV_CMOS
-	select CHROMEOS_VBNV_CMOS_BACKUP_TO_FLASH
 	select LID_SWITCH
-	select VBOOT_EC_SLOW_UPDATE
-	select VBOOT_OPROM_MATTERS
-	select VIRTUAL_DEV_SWITCH
-	select EC_SOFTWARE_SYNC
 
 config DRIVERS_GENERIC_MAX98357A
 	default y
diff --git a/src/soc/intel/skylake/Kconfig b/src/soc/intel/skylake/Kconfig
index 0871ed0..7485d96 100644
--- a/src/soc/intel/skylake/Kconfig
+++ b/src/soc/intel/skylake/Kconfig
@@ -51,6 +51,16 @@ config CPU_SPECIFIC_OPTIONS
 	select UDELAY_TSC
 	select USE_GENERIC_FSP_CAR_INC
 
+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 VBOOT_EC_SLOW_UPDATE
+	select VBOOT_OPROM_MATTERS
+	select VIRTUAL_DEV_SWITCH
+
 config BOOTBLOCK_CPU_INIT
 	string
 	default "soc/intel/skylake/bootblock/cpu.c"