<p>Martin Roth has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/28729">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">mainboard/google/kahlee: Only read a single vendor from oem.bin<br><br>Since each variant has a separate build, we don't need to support<br>multiple manufacturers in a single file.<br><br>BUG=b:79874904<br>TEST=Build, boot, see updated mainboard manufacturer<br><br>Change-Id: I0ccf207ba8d5e5200aa4b19c46784bbda82f7b6e<br>Signed-off-by: Martin Roth <martinroth@chromium.org><br>---<br>M src/mainboard/google/kahlee/variants/baseboard/mainboard.c<br>1 file changed, 5 insertions(+), 30 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/29/28729/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/mainboard/google/kahlee/variants/baseboard/mainboard.c b/src/mainboard/google/kahlee/variants/baseboard/mainboard.c</span><br><span>index ad5fb2b..b963953 100644</span><br><span>--- a/src/mainboard/google/kahlee/variants/baseboard/mainboard.c</span><br><span>+++ b/src/mainboard/google/kahlee/variants/baseboard/mainboard.c</span><br><span>@@ -76,26 +76,10 @@</span><br><span>   write32((void *)(sdbar + BH720_MEM_ACCESS_EN), 0x80000000);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static uint8_t calc_oem_id(void)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">-   return variant_board_sku() / 0x10;</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%);">-/* "oem.bin" in cbfs contains an array of records using the following structure. */</span><br><span style="color: hsl(0, 100%, 40%);">-struct oem_mapping {</span><br><span style="color: hsl(0, 100%, 40%);">-    uint8_t oem_id;</span><br><span style="color: hsl(0, 100%, 40%);">- char oem_name[10];</span><br><span style="color: hsl(0, 100%, 40%);">-} __packed;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-/* Local buffer to read "oem.bin" */</span><br><span style="color: hsl(0, 100%, 40%);">-static char oem_bin_data[200];</span><br><span> </span><br><span> const char *smbios_mainboard_manufacturer(void)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-   uint8_t oem_id;</span><br><span style="color: hsl(0, 100%, 40%);">- const struct oem_mapping *oem_entry = (void *)&oem_bin_data;</span><br><span style="color: hsl(0, 100%, 40%);">-        size_t oem_data_size;</span><br><span style="color: hsl(0, 100%, 40%);">-   unsigned int i, oem_entries_count;</span><br><span style="color: hsl(120, 100%, 40%);">+    static char oem_bin_data[10];</span><br><span>        static const char *manuf;</span><br><span> </span><br><span>        if (!IS_ENABLED(CONFIG_USE_OEM_BIN))</span><br><span>@@ -104,20 +88,11 @@</span><br><span>  if (manuf)</span><br><span>           return manuf;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-       oem_data_size = cbfs_boot_load_file("oem.bin", oem_bin_data,</span><br><span style="color: hsl(120, 100%, 40%);">+        if (cbfs_boot_load_file("oem.bin", oem_bin_data,</span><br><span>                                       sizeof(oem_bin_data),</span><br><span style="color: hsl(0, 100%, 40%);">-                                           CBFS_TYPE_RAW);</span><br><span style="color: hsl(0, 100%, 40%);">-     oem_id = calc_oem_id();</span><br><span style="color: hsl(0, 100%, 40%);">- oem_entries_count = oem_data_size / sizeof(*oem_entry);</span><br><span style="color: hsl(0, 100%, 40%);">- for (i = 0; i < oem_entries_count; i++) {</span><br><span style="color: hsl(0, 100%, 40%);">-            if (oem_id == oem_entry->oem_id) {</span><br><span style="color: hsl(0, 100%, 40%);">-                   manuf = oem_entry->oem_name;</span><br><span style="color: hsl(0, 100%, 40%);">-                 break;</span><br><span style="color: hsl(0, 100%, 40%);">-          }</span><br><span style="color: hsl(0, 100%, 40%);">-               oem_entry++;</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%);">-       if (manuf == NULL)</span><br><span style="color: hsl(120, 100%, 40%);">+                                        CBFS_TYPE_RAW))</span><br><span style="color: hsl(120, 100%, 40%);">+           manuf = &oem_bin_data[0];</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span>                 manuf = CONFIG_MAINBOARD_SMBIOS_MANUFACTURER;</span><br><span> </span><br><span>    return manuf;</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/28729">change 28729</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/28729"/><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: I0ccf207ba8d5e5200aa4b19c46784bbda82f7b6e </div>
<div style="display:none"> Gerrit-Change-Number: 28729 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Martin Roth <martinroth@google.com> </div>