<p>Zhuohao Lee has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/25252">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">mb/google/poppy/variants/nami: change type of board_sku_id() to uint32_t<br><br>Tools/scripts, like mosys/arc-setup, use int(4 bytes) to<br>read the sku id. In order to support "-1", we need to use<br>uint32_t(4 bytes) instead of using uint16_t(2 bytes) data type.<br>Otherwise, tools/scripts will read 65535 instead of -1.<br>Another reason to change this is that sku_id can be<br>supported by ec up to 4 bytes.<br><br>BUG=b:73792190<br>TEST=mosys output "Platform not Supported" for -1 sku id<br> arc-setup read -1 sku id<br><br>Change-Id: Ib3baa8419f138abeb412ac09c2e7dc608e3b758b<br>Signed-off-by: Zhuohao Lee <zhuohao@chromium.org><br>---<br>M src/mainboard/google/poppy/variants/nami/mainboard.c<br>1 file changed, 8 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/52/25252/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/mainboard/google/poppy/variants/nami/mainboard.c b/src/mainboard/google/poppy/variants/nami/mainboard.c</span><br><span>index e2bc895..191267b 100644</span><br><span>--- a/src/mainboard/google/poppy/variants/nami/mainboard.c</span><br><span>+++ b/src/mainboard/google/poppy/variants/nami/mainboard.c</span><br><span>@@ -23,20 +23,22 @@</span><br><span> #include <soc/ramstage.h></span><br><span> #include <string.h></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#define SKU_UNKNOWN 0xFFFF</span><br><span style="color: hsl(120, 100%, 40%);">+#define SKU_UNKNOWN 0xFFFFFFFF</span><br><span> #define SKU_0_NAMI 0x3A7B</span><br><span> #define SKU_1_VAYNE 0x3A63</span><br><span> #define SKU_2_VAYNE 0x3A7F</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static uint16_t board_sku_id(void)</span><br><span style="color: hsl(120, 100%, 40%);">+static uint32_t board_sku_id(void)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- static int sku_id = -1;</span><br><span style="color: hsl(120, 100%, 40%);">+ static uint32_t sku_id = SKU_UNKNOWN;</span><br><span> uint32_t id;</span><br><span style="color: hsl(0, 100%, 40%);">- if (sku_id >= 0)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (sku_id != SKU_UNKNOWN)</span><br><span> return sku_id;</span><br><span> if (google_chromeec_cbi_get_sku_id(&id))</span><br><span> return SKU_UNKNOWN;</span><br><span> sku_id = id;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> return sku_id;</span><br><span> }</span><br><span> </span><br><span>@@ -57,9 +59,9 @@</span><br><span> </span><br><span> const char *smbios_mainboard_sku(void)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- static char sku_str[9]; /* sku{0..65535} (basically up to FFFF) */</span><br><span style="color: hsl(120, 100%, 40%);">+ static char sku_str[14]; /* sku{0..4294967295} */</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- snprintf(sku_str, sizeof(sku_str), "sku%d", board_sku_id());</span><br><span style="color: hsl(120, 100%, 40%);">+ snprintf(sku_str, sizeof(sku_str), "sku%u", board_sku_id());</span><br><span> </span><br><span> return sku_str;</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/25252">change 25252</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/25252"/><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: Ib3baa8419f138abeb412ac09c2e7dc608e3b758b </div>
<div style="display:none"> Gerrit-Change-Number: 25252 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Zhuohao Lee <zhuohao@chromium.org> </div>