<p>Hannah Williams has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/23131">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">mainboard/glkrvp: Add EC_GOOGLE_CHROMEEC_SWITCHES<br><br>This patch adds the EC_GOOGLE_CHROMEEC_SWITCHES option so that we<br>use the common switch.c file<br><br>Change-Id: I93a2ba63015db17989c89ce1b5897de6a93e201f<br>Signed-off-by: Hannah Williams <hannah.williams@intel.com><br>---<br>M src/mainboard/intel/glkrvp/Kconfig<br>M src/mainboard/intel/glkrvp/chromeos.c<br>2 files changed, 1 insertion(+), 27 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/31/23131/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/mainboard/intel/glkrvp/Kconfig b/src/mainboard/intel/glkrvp/Kconfig</span><br><span>index 292da44..8c71e34 100644</span><br><span>--- a/src/mainboard/intel/glkrvp/Kconfig</span><br><span>+++ b/src/mainboard/intel/glkrvp/Kconfig</span><br><span>@@ -46,6 +46,7 @@</span><br><span> config VBOOT</span><br><span>        select HAS_RECOVERY_MRC_CACHE</span><br><span>        select MRC_CLEAR_NORMAL_CACHE_ON_RECOVERY_RETRAIN</span><br><span style="color: hsl(120, 100%, 40%);">+     select EC_GOOGLE_CHROMEEC_SWITCHES</span><br><span> </span><br><span> config MAINBOARD_DIR</span><br><span>       string</span><br><span>diff --git a/src/mainboard/intel/glkrvp/chromeos.c b/src/mainboard/intel/glkrvp/chromeos.c</span><br><span>index b7f56ec..a87ce4a 100644</span><br><span>--- a/src/mainboard/intel/glkrvp/chromeos.c</span><br><span>+++ b/src/mainboard/intel/glkrvp/chromeos.c</span><br><span>@@ -35,39 +35,12 @@</span><br><span>        lb_add_gpios(gpios, chromeos_gpios, ARRAY_SIZE(chromeos_gpios));</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int get_lid_switch(void)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">-      if (IS_ENABLED(CONFIG_EC_GOOGLE_CHROMEEC))</span><br><span style="color: hsl(0, 100%, 40%);">-      /* Read lid switch state from the EC. */</span><br><span style="color: hsl(0, 100%, 40%);">-                return !!(google_chromeec_get_switches() & EC_SWITCH_LID_OPEN);</span><br><span style="color: hsl(0, 100%, 40%);">-     else</span><br><span style="color: hsl(0, 100%, 40%);">-            return 1;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> int get_developer_mode_switch(void)</span><br><span> {</span><br><span>       /* No physical developer mode switch. It's virtual. */</span><br><span>   return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int get_recovery_mode_switch(void)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">-   if (!IS_ENABLED(CONFIG_EC_GOOGLE_CHROMEEC))</span><br><span style="color: hsl(0, 100%, 40%);">-             return 0;</span><br><span style="color: hsl(0, 100%, 40%);">-       /* Check if the EC has posted the keyboard recovery event. */</span><br><span style="color: hsl(0, 100%, 40%);">-   return !!(google_chromeec_get_events_b() &</span><br><span style="color: hsl(0, 100%, 40%);">-            EC_HOST_EVENT_MASK(EC_HOST_EVENT_KEYBOARD_RECOVERY));</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-int clear_recovery_mode_switch(void)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">-   if (!IS_ENABLED(CONFIG_EC_GOOGLE_CHROMEEC))</span><br><span style="color: hsl(0, 100%, 40%);">-             return 0;</span><br><span style="color: hsl(0, 100%, 40%);">-       /* Clear keyboard recovery event. */</span><br><span style="color: hsl(0, 100%, 40%);">-    return google_chromeec_clear_events_b(</span><br><span style="color: hsl(0, 100%, 40%);">-          EC_HOST_EVENT_MASK(EC_HOST_EVENT_KEYBOARD_RECOVERY));</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> int get_write_protect_state(void)</span><br><span> {</span><br><span>     return 0;</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/23131">change 23131</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://review.coreboot.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://review.coreboot.org/23131"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: coreboot </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I93a2ba63015db17989c89ce1b5897de6a93e201f </div>
<div style="display:none"> Gerrit-Change-Number: 23131 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Hannah Williams <hannah.williams@intel.com> </div>
<div style="display:none"> Gerrit-Reviewer: Shaunak Saha <shaunak.saha@intel.com> </div>