From 31f6320afeedfe622b0af51360078be28d26e378 Mon Sep 17 00:00:00 2001 From: Furquan Shaikh Date: Sat, 13 Mar 2021 22:34:57 -0800 Subject: drivers/wifi, mb/google: Drop config `WIFI_SAR_CBFS` Now that SAR support in VPD is deprecated in coreboot, there is no need for a separate Kconfig `WIFI_SAR_CBFS` as the SAR table is only supported as a CBFS file. This change drops the config `WIFI_SAR_CBFS` from drivers/wifi/generic/Kconfig and its selection in mb/google/.../Kconfig. wifi_sar_defaults.hex is added to CBFS only if CONFIG_WIFI_SAR_CBFS_FILEPATH is not empty because current mainboards do not provide a default SAR file in coreboot. Thus, CONFIG_WIFI_SAR_CBFS_FILEPATH is updated to have a default value of "". BUG=b:173465272 Cq-Depend: chromium:2757781 Change-Id: I0bb8f6e2511596e4503fe4d8c34439228ceaa3c7 Signed-off-by: Furquan Shaikh Reviewed-on: https://review.coreboot.org/c/coreboot/+/51484 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi Reviewed-by: Tim Wawrzynczak --- src/mainboard/google/dedede/Kconfig | 1 - src/mainboard/google/drallion/Kconfig | 1 - src/mainboard/google/hatch/Kconfig | 1 - src/mainboard/google/volteer/Kconfig | 1 - 4 files changed, 4 deletions(-) (limited to 'src/mainboard/google') diff --git a/src/mainboard/google/dedede/Kconfig b/src/mainboard/google/dedede/Kconfig index 8a667b363d..424bf15502 100644 --- a/src/mainboard/google/dedede/Kconfig +++ b/src/mainboard/google/dedede/Kconfig @@ -55,7 +55,6 @@ config CHROMEOS_WIFI_SAR select DSAR_ENABLE select SAR_ENABLE select USE_SAR - select WIFI_SAR_CBFS config DEVICETREE string diff --git a/src/mainboard/google/drallion/Kconfig b/src/mainboard/google/drallion/Kconfig index 919592ec8d..fdcbd05b1a 100644 --- a/src/mainboard/google/drallion/Kconfig +++ b/src/mainboard/google/drallion/Kconfig @@ -40,7 +40,6 @@ config CHROMEOS_WIFI_SAR select GEO_SAR_ENABLE select SAR_ENABLE select USE_SAR - select WIFI_SAR_CBFS config DIMM_MAX int diff --git a/src/mainboard/google/hatch/Kconfig b/src/mainboard/google/hatch/Kconfig index ef0c9ed972..ef0e36e35d 100644 --- a/src/mainboard/google/hatch/Kconfig +++ b/src/mainboard/google/hatch/Kconfig @@ -62,7 +62,6 @@ config CHROMEOS_WIFI_SAR select GEO_SAR_ENABLE select SAR_ENABLE select USE_SAR - select WIFI_SAR_CBFS config DEVICETREE string diff --git a/src/mainboard/google/volteer/Kconfig b/src/mainboard/google/volteer/Kconfig index 47f93cc77c..f6f1e4151c 100644 --- a/src/mainboard/google/volteer/Kconfig +++ b/src/mainboard/google/volteer/Kconfig @@ -56,7 +56,6 @@ config CHROMEOS_WIFI_SAR select GEO_SAR_ENABLE select SAR_ENABLE select USE_SAR - select WIFI_SAR_CBFS config DIMM_SPD_SIZE int -- cgit v1.2.3