summaryrefslogtreecommitdiffstats
path: root/src/mainboard/google/volteer/variants/lindar
diff options
context:
space:
mode:
authorFurquan Shaikh <furquan@google.com>2021-03-13 22:54:16 -0800
committerPatrick Georgi <pgeorgi@google.com>2021-03-17 07:56:13 +0000
commit7fe5d3d382e25fbdd5026c8e0231dc5a10b57931 (patch)
treef97fe6e53afe9ff6f61eee4303cd8b5377c7e87d /src/mainboard/google/volteer/variants/lindar
parent31f6320afeedfe622b0af51360078be28d26e378 (diff)
downloadcoreboot-7fe5d3d382e25fbdd5026c8e0231dc5a10b57931.tar.gz
coreboot-7fe5d3d382e25fbdd5026c8e0231dc5a10b57931.tar.bz2
coreboot-7fe5d3d382e25fbdd5026c8e0231dc5a10b57931.zip
sar: Fix semantics of `get_wifi_sar_cbfs_filename()`
Currently, if `get_wifi_sar_cbfs_filename()` returns NULL, then `get_wifi_sar_limits()` assumes that the default filename is used for CBFS SAR file. This prevents a board from supporting different models using the same firmware -- some which require SAR support and some which don't. This change updates the logic in `get_wifi_sar_limits()` to return early if filename is not provided by the mainboard. In order to maintain the same logic as before, current mainboards are updated to return WIFI_SAR_CBFS_DEFAULT_FILENAME instead of NULL in default case. Change-Id: I68b5bdd213767a3cd81fe41ace66540acd68e26a Signed-off-by: Furquan Shaikh <furquan@google.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/51485 Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/mainboard/google/volteer/variants/lindar')
-rw-r--r--src/mainboard/google/volteer/variants/lindar/variant.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/mainboard/google/volteer/variants/lindar/variant.c b/src/mainboard/google/volteer/variants/lindar/variant.c
index b8d7165be393..2d10dc6fc10e 100644
--- a/src/mainboard/google/volteer/variants/lindar/variant.c
+++ b/src/mainboard/google/volteer/variants/lindar/variant.c
@@ -5,12 +5,10 @@
const char *get_wifi_sar_cbfs_filename(void)
{
- const char *filename = NULL;
-
if (fw_config_probe(FW_CONFIG(WIFI_SAR_ID, WIFI_SAR_ID_0)))
- filename = "wifi_sar_0.hex";
+ return "wifi_sar_0.hex";
else if (fw_config_probe(FW_CONFIG(WIFI_SAR_ID, WIFI_SAR_ID_1)))
- filename = "wifi_sar_1.hex";
+ return "wifi_sar_1.hex";
- return filename;
+ return WIFI_SAR_CBFS_DEFAULT_FILENAME;
}