<p>Justin TerAvest has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/c/coreboot/+/30222">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">WIP: google: add support for multiple SAR filenames<br><br>Using a fixed filename only allows for one SAR configuration to be<br>checked into CBFS. However, we have devices with shared firmware that<br>would desire separate SAR configurations. This change allows boards to<br>define a function to select one of multiple files stored in CBFS to be<br>used.<br><br>Change-Id: Ib852aaaff39f1e9149fa43bf8dc25b2400737ea5<br>---<br>M src/drivers/intel/wifi/wifi.c<br>M src/include/sar.h<br>M src/vendorcode/google/chromeos/sar.c<br>3 files changed, 13 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/22/30222/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/drivers/intel/wifi/wifi.c b/src/drivers/intel/wifi/wifi.c</span><br><span>index e197114..51f4b98 100644</span><br><span>--- a/src/drivers/intel/wifi/wifi.c</span><br><span>+++ b/src/drivers/intel/wifi/wifi.c</span><br><span>@@ -70,6 +70,12 @@</span><br><span>      return -1;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+__weak</span><br><span style="color: hsl(120, 100%, 40%);">+const char* get_wifi_sar_cbfs_filename(void)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+  return NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> #if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES)</span><br><span> static void emit_sar_acpi_structures(void)</span><br><span> {</span><br><span>diff --git a/src/include/sar.h b/src/include/sar.h</span><br><span>index 9da4dd9..096a273 100644</span><br><span>--- a/src/include/sar.h</span><br><span>+++ b/src/include/sar.h</span><br><span>@@ -54,4 +54,6 @@</span><br><span>  */</span><br><span> int get_wifi_sar_limits(struct wifi_sar_limits *sar_limits);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+const char* get_wifi_sar_cbfs_filename(void);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> #endif /* _SAR_H_ */</span><br><span>diff --git a/src/vendorcode/google/chromeos/sar.c b/src/vendorcode/google/chromeos/sar.c</span><br><span>index 6799f12..70c8f18 100644</span><br><span>--- a/src/vendorcode/google/chromeos/sar.c</span><br><span>+++ b/src/vendorcode/google/chromeos/sar.c</span><br><span>@@ -26,7 +26,11 @@</span><br><span> </span><br><span> static int load_sar_file_from_cbfs(void *buf, size_t buffer_size)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-        return cbfs_boot_load_file(WIFI_SAR_CBFS_FILENAME, buf,</span><br><span style="color: hsl(120, 100%, 40%);">+       const char *filename = get_wifi_sar_cbfs_filename();</span><br><span style="color: hsl(120, 100%, 40%);">+  if (filename == NULL) {</span><br><span style="color: hsl(120, 100%, 40%);">+               filename = WIFI_SAR_CBFS_FILENAME;</span><br><span style="color: hsl(120, 100%, 40%);">+    }</span><br><span style="color: hsl(120, 100%, 40%);">+     return cbfs_boot_load_file(filename, buf,</span><br><span>                    buffer_size, CBFS_TYPE_RAW);</span><br><span> }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/c/coreboot/+/30222">change 30222</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/c/coreboot/+/30222"/><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-Change-Id: Ib852aaaff39f1e9149fa43bf8dc25b2400737ea5 </div>
<div style="display:none"> Gerrit-Change-Number: 30222 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Justin TerAvest <teravest@chromium.org> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>