| commit | e997fa3311bb94d8d1781c4cf0363b18c9e67270 | [log] [tgz] |
|---|---|---|
| author | Zhuohao Lee <zhuohao@chromium.org> | Thu Mar 11 12:07:57 2021 +0800 |
| committer | Commit Bot <commit-bot@chromium.org> | Mon Mar 15 11:24:59 2021 +0000 |
| tree | a0fe2fcb5a05e60356ff2ef8d8a3b4d8ebbcf3bb | |
| parent | a9ace5c7e93eb4b757c1b1c13eb16830a7920063 [diff] |
UPSTREAM: rammus: get cbfs sar table name based on the sku id This patch overrides the get_wifi_sar_cbfs_filename() to return different sar table according to the sku id. BUG=b:173465272 TEST=checked bios log and the correct sar table was loaded. Change-Id: Id4c67f0a6f2f6b1fc374002893ae1957093f2f0b Signed-off-by: Patrick Georgi <pgeorgi@google.com> Original-Commit-Id: e6f12d0d5025e276b9022ee2ff9a6d4d195029e8 Original-Change-Id: Ia30d760b1a029197d470818c73bfd2c00514652d Original-Signed-off-by: Zhuohao Lee <zhuohao@chromium.org> Original-Reviewed-on: https://review.coreboot.org/c/coreboot/+/51413 Original-Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Original-Reviewed-by: Furquan Shaikh <furquan@google.com> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/coreboot/+/2759666 Reviewed-by: Patrick Georgi <pgeorgi@chromium.org> Commit-Queue: Patrick Georgi <pgeorgi@chromium.org> Tested-by: Patrick Georgi <pgeorgi@chromium.org> (cherry picked from commit cb6bc8c28eaea5a4cb22f6780b17548e95d866fe) Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/coreboot/+/2759815 Reviewed-by: Zhuohao Lee <zhuohao@chromium.org> Commit-Queue: Zhuohao Lee <zhuohao@chromium.org> Tested-by: Zhuohao Lee <zhuohao@chromium.org>
diff --git a/src/mainboard/google/poppy/variants/rammus/mainboard.c b/src/mainboard/google/poppy/variants/rammus/mainboard.c index a3474d4..ca43985 100644 --- a/src/mainboard/google/poppy/variants/rammus/mainboard.c +++ b/src/mainboard/google/poppy/variants/rammus/mainboard.c
@@ -17,6 +17,7 @@ #include <ec/google/chromeec/ec.h> #include <smbios.h> #include <string.h> +#include <sar.h> #define SKU_UNKNOWN 0xFFFFFFFF @@ -42,3 +43,17 @@ return sku_str; } + +const char *get_wifi_sar_cbfs_filename(void) +{ + const char *filename = NULL; + uint32_t sku_id; + + sku_id = variant_board_sku(); + if (sku_id & 0x200) + filename = "wifi_sar-shyvana.hex"; + else + filename = "wifi_sar-leona.hex"; + + return filename; +}