[coreboot-gerrit] [S] Change in coreboot[main]: mb/google/nissa/var/riven: enable WIFI_SAR

[David Wu (Code Review)]

David Wu has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/84281?usp=email )

Change subject: mb/google/nissa/var/riven: enable WIFI_SAR
......................................................................

mb/google/nissa/var/riven: enable WIFI_SAR

Add get_wifi_sar_cbfs_filename(). This function uses the FW_CONFIG
for WIFI_SAR_ID to choose the right wifi_sar hex file.

BUG=b:362359938
TEST=emerge-nissa coreboot chromeos-bootimage

Change-Id: Ib43aff8c9e6ebb8880f7c779f7078b3405278490
Signed-off-by: David Wu 
---
M src/mainboard/google/brya/Kconfig
M src/mainboard/google/brya/variants/riven/overridetree.cb
M src/mainboard/google/brya/variants/riven/variant.c
3 files changed, 12 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/81/84281/1

diff --git a/src/mainboard/google/brya/Kconfig b/src/mainboard/google/brya/Kconfig
index b54b0db..a8c8345 100644
--- a/src/mainboard/google/brya/Kconfig
+++ b/src/mainboard/google/brya/Kconfig
@@ -476,6 +476,7 @@

config BOARD_GOOGLE_RIVEN
    select BOARD_GOOGLE_BASEBOARD_NISSA
+	select CHROMEOS_WIFI_SAR if CHROMEOS
    select DRIVERS_GENERIC_GPIO_KEYS
    select DRIVERS_INTEL_MIPI_CAMERA
    select HAVE_WWAN_POWER_SEQUENCE
diff --git a/src/mainboard/google/brya/variants/riven/overridetree.cb b/src/mainboard/google/brya/variants/riven/overridetree.cb
index 6f33f48..d565897 100644
--- a/src/mainboard/google/brya/variants/riven/overridetree.cb
+++ b/src/mainboard/google/brya/variants/riven/overridetree.cb
@@ -8,6 +8,10 @@
    	option STYLUS_ABSENT		0
    	option STYLUS_PRESENT		1
    end
+	field WIFI_SAR_ID 4 6
+		option ID_0			0
+		option ID_1			1
+	end
    field WIFI_TYPE 7
    	option WIFI_CNVI		0
    	option WIFI_PCIE		1
diff --git a/src/mainboard/google/brya/variants/riven/variant.c b/src/mainboard/google/brya/variants/riven/variant.c
index 15460ce..17c1e3c 100644
--- a/src/mainboard/google/brya/variants/riven/variant.c
+++ b/src/mainboard/google/brya/variants/riven/variant.c
@@ -2,6 +2,13 @@

#include <baseboard/variants.h>
 #include <boardid.h>
+#include <fw_config.h>
+#include <sar.h>
+
+const char *get_wifi_sar_cbfs_filename(void)
+{
+	return get_wifi_sar_fw_config_filename(FW_CONFIG_FIELD(WIFI_SAR_ID));
+}

void variant_update_soc_chip_config(struct soc_intel_alderlake_config *config)
 {