summaryrefslogtreecommitdiff
path: root/src/ec/google
diff options
context:
space:
mode:
authorJulius Werner <jwerner@chromium.org>2017-02-13 17:53:29 -0800
committerJulius Werner <jwerner@chromium.org>2017-03-28 22:18:13 +0200
commit58c3938705af5dd96456216a17d579868e0f5b77 (patch)
treeb1531c163a2679c76395090717e835a851e027ae /src/ec/google
parent73d042bd90bc8877f9bfd8b846578fe3e12444c3 (diff)
downloadcoreboot-58c3938705af5dd96456216a17d579868e0f5b77.tar.xz
vboot: Move remaining features out of vendorcode/google/chromeos
This patch attempts to finish the separation between CONFIG_VBOOT and CONFIG_CHROMEOS by moving the remaining options and code (including image generation code for things like FWID and GBB flags, which are intrinsic to vboot itself) from src/vendorcode/google/chromeos to src/vboot. Also taking this opportunity to namespace all VBOOT Kconfig options, and clean up menuconfig visibility for them (i.e. some options were visible even though they were tied to the hardware while others were invisible even though it might make sense to change them). CQ-DEPEND=CL:459088 Change-Id: I3e2e31150ebf5a96b6fe507ebeb53a41ecf88122 Signed-off-by: Julius Werner <jwerner@chromium.org> Reviewed-on: https://review.coreboot.org/18984 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Diffstat (limited to 'src/ec/google')
-rw-r--r--src/ec/google/chromeec/Kconfig2
-rw-r--r--src/ec/google/chromeec/switches.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/ec/google/chromeec/Kconfig b/src/ec/google/chromeec/Kconfig
index 76eef05dbe..3e9cb29375 100644
--- a/src/ec/google/chromeec/Kconfig
+++ b/src/ec/google/chromeec/Kconfig
@@ -160,7 +160,7 @@ config EC_GOOGLE_CHROMEEC_PD_FIRMWARE_FILE
The path and filename of the PD firmware file to use.
config EC_GOOGLE_CHROMEEC_SWITCHES
- depends on EC_GOOGLE_CHROMEEC && CHROMEOS
+ depends on EC_GOOGLE_CHROMEEC && VBOOT
bool
help
Enable support for Chrome OS mode switches provided by the Chrome OS
diff --git a/src/ec/google/chromeec/switches.c b/src/ec/google/chromeec/switches.c
index 7ed4bfd5cc..e05d37c205 100644
--- a/src/ec/google/chromeec/switches.c
+++ b/src/ec/google/chromeec/switches.c
@@ -20,7 +20,7 @@
#if IS_ENABLED(CONFIG_EC_GOOGLE_CHROMEEC_LPC)
int get_lid_switch(void)
{
- if (!IS_ENABLED(CONFIG_LID_SWITCH))
+ if (!IS_ENABLED(CONFIG_VBOOT_LID_SWITCH))
return -1;
return !!(google_chromeec_get_switches() & EC_SWITCH_LID_OPEN);