Shelley Chen has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/80085?usp=email )
Change subject: WIP: mb/google/brox: enable WIFI_SAR ......................................................................
WIP: mb/google/brox: enable WIFI_SAR
Add get_wifi_sar_cbfs_filename(). This function uses the FW_CONFIG for WIFI to choose the right wifi_sar hex file. Currently, my understanding is: wifi_sar_0.hex = wifi6 wifi_sar_1.hex = wifi7
BUG=b:319302319 BRANCH=None TEST=emerge-brox coreboot chromeos-bootimage
Change-Id: I212c80412141e7770a512bd8ccf4111963bab395 Signed-off-by: Shelley Chen shchen@google.com --- M src/mainboard/google/brox/Kconfig M src/mainboard/google/brox/variants/brox/variant.c 2 files changed, 15 insertions(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/85/80085/1
diff --git a/src/mainboard/google/brox/Kconfig b/src/mainboard/google/brox/Kconfig index ce0f2e0..3064927 100644 --- a/src/mainboard/google/brox/Kconfig +++ b/src/mainboard/google/brox/Kconfig @@ -53,6 +53,7 @@
config BOARD_GOOGLE_BROX select BOARD_GOOGLE_BASEBOARD_BROX + select CHROMEOS_WIFI_SAR if CHROMEOS
if BOARD_GOOGLE_BROX_COMMON
diff --git a/src/mainboard/google/brox/variants/brox/variant.c b/src/mainboard/google/brox/variants/brox/variant.c index acb5b66..64001de 100644 --- a/src/mainboard/google/brox/variants/brox/variant.c +++ b/src/mainboard/google/brox/variants/brox/variant.c @@ -1,9 +1,22 @@ /* SPDX-License-Identifier: GPL-2.0-only */
+#include <assert.h> #include <chip.h> -#include <fw_config.h> #include <baseboard/variants.h> +#include <fw_config.h> +#include <sar.h>
void variant_update_soc_chip_config(struct soc_intel_alderlake_config *config) { } + +const char *get_wifi_sar_cbfs_filename(void) +{ + /* CNVI is using WIFI 6 */ + if (fw_config_probe(FW_CONFIG(WIFI, WIFI_CNVI))) + return "wifi_sar_0.hex"; + + /* PCIE is using WIFI 7 */ + ASSERT(fw_config_probe(FW_CONFIG(WIFI, WIFI_PCIE))); + return "wifi_sar_1.hex"; +}