diff options
| author | Furquan Shaikh <furquan@google.com> | 2021-03-13 22:54:16 -0800 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2021-03-17 07:56:13 +0000 |
| commit | 7fe5d3d382e25fbdd5026c8e0231dc5a10b57931 (patch) | |
| tree | f97fe6e53afe9ff6f61eee4303cd8b5377c7e87d /src/mainboard/google/hatch/variants | |
| parent | 31f6320afeedfe622b0af51360078be28d26e378 (diff) | |
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/hatch/variants')
| -rw-r--r-- | src/mainboard/google/hatch/variants/dratini/variant.c | 6 | ||||
| -rw-r--r-- | src/mainboard/google/hatch/variants/kindred/variant.c | 5 |
2 files changed, 4 insertions, 7 deletions
diff --git a/src/mainboard/google/hatch/variants/dratini/variant.c b/src/mainboard/google/hatch/variants/dratini/variant.c index 1a4cd4049b..72f62316e3 100644 --- a/src/mainboard/google/hatch/variants/dratini/variant.c +++ b/src/mainboard/google/hatch/variants/dratini/variant.c @@ -7,7 +7,6 @@ const char *get_wifi_sar_cbfs_filename(void) { - const char *filename = NULL; uint32_t sku_id = google_chromeec_get_board_sku(); switch (sku_id) { @@ -15,8 +14,7 @@ const char *get_wifi_sar_cbfs_filename(void) case SKU_22_DRAGONAIR: case SKU_23_DRAGONAIR: case SKU_24_DRAGONAIR: - filename = "wifi_sar-dragonair.hex"; - break; + return "wifi_sar-dragonair.hex"; } - return filename; + return WIFI_SAR_CBFS_DEFAULT_FILENAME; } diff --git a/src/mainboard/google/hatch/variants/kindred/variant.c b/src/mainboard/google/hatch/variants/kindred/variant.c index 9430f67ab1..3510dbb68e 100644 --- a/src/mainboard/google/hatch/variants/kindred/variant.c +++ b/src/mainboard/google/hatch/variants/kindred/variant.c @@ -39,12 +39,11 @@ void variant_devtree_update(void) const char *get_wifi_sar_cbfs_filename(void) { - const char *filename = NULL; uint32_t sku_id = google_chromeec_get_board_sku(); if (sku_id == 1 || sku_id == 2 || sku_id == 3 || sku_id == 4) - filename = "wifi_sar-kled.hex"; - return filename; + return "wifi_sar-kled.hex"; + return WIFI_SAR_CBFS_DEFAULT_FILENAME; } const char *mainboard_vbt_filename(void) |