diff options
| author | Furquan Shaikh <furquan@google.com> | 2016-07-22 16:17:53 -0700 |
|---|---|---|
| committer | Furquan Shaikh <furquan@google.com> | 2016-07-25 18:55:21 +0200 |
| commit | 610a33a7f4d8c46df63373477a9b19563189acea (patch) | |
| tree | bd5769901167eb9e99ba45ca782062dd7843c627 | |
| parent | 87b1bcc4af5903f67251ed464170dcf7148b564b (diff) | |
| download | coreboot-610a33a7f4d8c46df63373477a9b19563189acea.tar.xz | |
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@google.com>
Reviewed-on: https://review.coreboot.org/15822
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Tested-by: build bot (Jenkins)
| -rw-r--r-- | src/mainboard/google/chell/Kconfig | 7 | ||||
| -rw-r--r-- | src/mainboard/google/glados/Kconfig | 7 | ||||
| -rw-r--r-- | src/mainboard/google/lars/Kconfig | 7 | ||||
| -rw-r--r-- | src/mainboard/intel/kunimitsu/Kconfig | 7 | ||||
| -rw-r--r-- | src/soc/intel/skylake/Kconfig | 9 |
5 files changed, 9 insertions, 28 deletions
diff --git a/src/mainboard/google/chell/Kconfig b/src/mainboard/google/chell/Kconfig index 95102b6baf..5ed211abb2 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 abe5fa84f9..3acb8e982e 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 ee08067bed..c6025230a2 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 85b568ebf2..d2e6951897 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 0871ed019a..126ef2ef16 100644 --- a/src/soc/intel/skylake/Kconfig +++ b/src/soc/intel/skylake/Kconfig @@ -51,6 +51,15 @@ config CPU_SPECIFIC_OPTIONS select UDELAY_TSC select USE_GENERIC_FSP_CAR_INC +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 VBOOT_EC_SLOW_UPDATE + select VBOOT_OPROM_MATTERS + select VIRTUAL_DEV_SWITCH + config BOOTBLOCK_CPU_INIT string default "soc/intel/skylake/bootblock/cpu.c" |