summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFurquan Shaikh <furquan@google.com>2018-06-21 08:38:18 -0700
committerFurquan Shaikh <furquan@google.com>2018-06-22 16:24:54 +0000
commitd9bbbe3ca48c0bebada3b50435a02d1e87775db6 (patch)
tree56d73298d56f771642b8e173c1099b058d5cbde4
parentace395b96a2c2a398da144fe0fec176a21a8876c (diff)
downloadcoreboot-d9bbbe3ca48c0bebada3b50435a02d1e87775db6.tar.xz
mb/google/octopus: Update GBB_FLAG_DISABLE_EC_SOFTWARE_SYNC
Move GBB_FLAG_DISABLE_EC_SOFTWARE_SYNC under each variant config and select it for bip and fleex only. Functional change in this CL is that EC SW sync will be enabled for phaser. BUG=b:110523400 Change-Id: If6f37c6b2ee71130b9ed5b10ce92fb23fa1c39fc Signed-off-by: Furquan Shaikh <furquan@google.com> Reviewed-on: https://review.coreboot.org/27179 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Aaron Durbin <adurbin@chromium.org> Reviewed-by: Justin TerAvest <teravest@chromium.org> Reviewed-by: Sumeet R Pawnikar <sumeet.r.pawnikar@intel.com> Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
-rw-r--r--src/mainboard/google/octopus/Kconfig1
-rw-r--r--src/mainboard/google/octopus/Kconfig.name12
2 files changed, 9 insertions, 4 deletions
diff --git a/src/mainboard/google/octopus/Kconfig b/src/mainboard/google/octopus/Kconfig
index d768604f44..226e44f7fa 100644
--- a/src/mainboard/google/octopus/Kconfig
+++ b/src/mainboard/google/octopus/Kconfig
@@ -29,7 +29,6 @@ config CHROMEOS
bool
default y
select EC_GOOGLE_CHROMEEC_SWITCHES
- select GBB_FLAG_DISABLE_EC_SOFTWARE_SYNC if !BOARD_GOOGLE_YORP
select HAS_RECOVERY_MRC_CACHE
select MRC_CLEAR_NORMAL_CACHE_ON_RECOVERY_RETRAIN
select VBOOT_LID_SWITCH
diff --git a/src/mainboard/google/octopus/Kconfig.name b/src/mainboard/google/octopus/Kconfig.name
index 182ebe4c8e..f30b46fd3c 100644
--- a/src/mainboard/google/octopus/Kconfig.name
+++ b/src/mainboard/google/octopus/Kconfig.name
@@ -4,23 +4,29 @@ config BOARD_GOOGLE_OCTOPUS
bool "-> Octopus"
select BOARD_GOOGLE_BASEBOARD_OCTOPUS
select BASEBOARD_OCTOPUS_LAPTOP
+
config BOARD_GOOGLE_YORP
bool "-> Yorp"
select BOARD_GOOGLE_BASEBOARD_OCTOPUS
select BASEBOARD_OCTOPUS_LAPTOP
select NHLT_DA7219 if INCLUDE_NHLT_BLOBS
+
config BOARD_GOOGLE_BIP
bool "-> Bip"
- select BOARD_GOOGLE_BASEBOARD_OCTOPUS
select BASEBOARD_OCTOPUS_LAPTOP
+ select BOARD_GOOGLE_BASEBOARD_OCTOPUS
+ select GBB_FLAG_DISABLE_EC_SOFTWARE_SYNC if CHROMEOS
select NHLT_RT5682 if INCLUDE_NHLT_BLOBS
+
config BOARD_GOOGLE_PHASER
bool "-> Phaser"
- select BOARD_GOOGLE_BASEBOARD_OCTOPUS
select BASEBOARD_OCTOPUS_LAPTOP
+ select BOARD_GOOGLE_BASEBOARD_OCTOPUS
select NHLT_DA7219 if INCLUDE_NHLT_BLOBS
+
config BOARD_GOOGLE_FLEEX
bool "-> Fleex"
- select BOARD_GOOGLE_BASEBOARD_OCTOPUS
select BASEBOARD_OCTOPUS_LAPTOP
+ select BOARD_GOOGLE_BASEBOARD_OCTOPUS
+ select GBB_FLAG_DISABLE_EC_SOFTWARE_SYNC if CHROMEOS
select NHLT_DA7219 if INCLUDE_NHLT_BLOBS