<p>Daisuke Nojiri has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/23788">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">chromeec: Sync ec_commands.h for CBI tags<br><br>This patch syncs ec_commands.h with the one in chromeec.<br><br>BUG=b:70294260<br>BRANCH=none<br>TEST=Verify SKU_ID and OEM_ID are correctly recognized on Fizz.<br><br>Change-Id: I451ec9f6f9d7257915b7d4cb1e5adbee82d107de<br>Signed-off-by: Daisuke Nojiri <dnojiri@chromium.org><br>---<br>M src/ec/google/chromeec/ec.c<br>M src/ec/google/chromeec/ec_commands.h<br>2 files changed, 11 insertions(+), 14 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/88/23788/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/ec/google/chromeec/ec.c b/src/ec/google/chromeec/ec.c</span><br><span>index e8c50aa..a290f61 100644</span><br><span>--- a/src/ec/google/chromeec/ec.c</span><br><span>+++ b/src/ec/google/chromeec/ec.c</span><br><span>@@ -585,12 +585,12 @@</span><br><span> </span><br><span> int google_chromeec_cbi_get_sku_id(uint32_t *id)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-  return cbi_get_uint32(id, CBI_DATA_SKU_ID);</span><br><span style="color: hsl(120, 100%, 40%);">+   return cbi_get_uint32(id, CBI_TAG_SKU_ID);</span><br><span> }</span><br><span> </span><br><span> int google_chromeec_cbi_get_oem_id(uint32_t *id)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-    return cbi_get_uint32(id, CBI_DATA_OEM_ID);</span><br><span style="color: hsl(120, 100%, 40%);">+   return cbi_get_uint32(id, CBI_TAG_OEM_ID);</span><br><span> }</span><br><span> </span><br><span> #ifndef __SMM__</span><br><span>diff --git a/src/ec/google/chromeec/ec_commands.h b/src/ec/google/chromeec/ec_commands.h</span><br><span>index b333dde..cfd62e6 100644</span><br><span>--- a/src/ec/google/chromeec/ec_commands.h</span><br><span>+++ b/src/ec/google/chromeec/ec_commands.h</span><br><span>@@ -4383,14 +4383,11 @@</span><br><span>  */</span><br><span> #define EC_CMD_SET_CROS_BOARD_INFO      0x0120</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-enum cbi_data_type {</span><br><span style="color: hsl(0, 100%, 40%);">-  /* integer types */</span><br><span style="color: hsl(0, 100%, 40%);">-     CBI_DATA_BOARD_VERSION = 0,</span><br><span style="color: hsl(0, 100%, 40%);">-     CBI_DATA_OEM_ID = 1,</span><br><span style="color: hsl(0, 100%, 40%);">-    CBI_DATA_SKU_ID = 2,</span><br><span style="color: hsl(0, 100%, 40%);">-    /* string types */</span><br><span style="color: hsl(0, 100%, 40%);">-      CBI_FIRST_STRING_PARAM = 0x1000,</span><br><span style="color: hsl(0, 100%, 40%);">-        CBI_DATA_COUNT,</span><br><span style="color: hsl(120, 100%, 40%);">+enum cbi_data_tag {</span><br><span style="color: hsl(120, 100%, 40%);">+  CBI_TAG_BOARD_VERSION = 0,</span><br><span style="color: hsl(120, 100%, 40%);">+    CBI_TAG_OEM_ID = 1,</span><br><span style="color: hsl(120, 100%, 40%);">+   CBI_TAG_SKU_ID = 2,</span><br><span style="color: hsl(120, 100%, 40%);">+   CBI_TAG_COUNT,</span><br><span> };</span><br><span> </span><br><span> /*</span><br><span>@@ -4402,7 +4399,7 @@</span><br><span> #define CBI_GET_RELOAD                (1 << 0)</span><br><span> </span><br><span> struct __ec_align4 ec_params_get_cbi {</span><br><span style="color: hsl(0, 100%, 40%);">-    uint32_t type;          /* enum cbi_data_type */</span><br><span style="color: hsl(120, 100%, 40%);">+      uint32_t type;          /* enum cbi_data_tag */</span><br><span>      uint32_t flag;          /* CBI_GET_* */</span><br><span> };</span><br><span> </span><br><span>@@ -4418,10 +4415,10 @@</span><br><span> #define CBI_SET_INIT             (1 << 1)</span><br><span> </span><br><span> struct __ec_align1 ec_params_set_cbi {</span><br><span style="color: hsl(0, 100%, 40%);">-    uint32_t type;          /* enum cbi_data_type */</span><br><span style="color: hsl(120, 100%, 40%);">+      uint32_t tag;           /* enum cbi_data_tag */</span><br><span>      uint32_t flag;          /* CBI_SET_* */</span><br><span style="color: hsl(0, 100%, 40%);">- uint32_t data;          /* For numeric value */</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t raw[];          /* For string and raw data */</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t size;          /* Data size */</span><br><span style="color: hsl(120, 100%, 40%);">+       uint8_t data[];         /* For string and raw data */</span><br><span> };</span><br><span> </span><br><span> /*****************************************************************************/</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/23788">change 23788</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/23788"/><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: I451ec9f6f9d7257915b7d4cb1e5adbee82d107de </div>
<div style="display:none"> Gerrit-Change-Number: 23788 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Daisuke Nojiri <dnojiri@chromium.org> </div>