summaryrefslogtreecommitdiff
path: root/src/drivers/wifi
diff options
context:
space:
mode:
Diffstat (limited to 'src/drivers/wifi')
-rw-r--r--src/drivers/wifi/generic/Kconfig17
-rw-r--r--src/drivers/wifi/generic/Makefile.inc10
2 files changed, 10 insertions, 17 deletions
diff --git a/src/drivers/wifi/generic/Kconfig b/src/drivers/wifi/generic/Kconfig
index 43c7d9ee1b..1d0e19f005 100644
--- a/src/drivers/wifi/generic/Kconfig
+++ b/src/drivers/wifi/generic/Kconfig
@@ -21,9 +21,6 @@ config USE_SAR
default n
help
Enable it when wifi driver uses SAR configuration feature.
- VPD entry "wifi_sar" is read to get SAR settings, if its
- not found driver may look into CBFS for default settigs.
- WIFI_SAR_CBFS is option to enable CBFS lookup.
config SAR_ENABLE
bool
@@ -40,20 +37,10 @@ config GEO_SAR_ENABLE
default n
depends on USE_SAR
-config WIFI_SAR_CBFS
- bool "Enable SAR table addition to CBFS"
- default n
- depends on USE_SAR
- help
- wifi driver would look for "wifi_sar" vpd key and load SAR settings from
- it, if the vpd key is not found then the driver tries to look for sar
- settings from CBFS with file name wifi_sar_defaults.hex.
- So OEM/ODM can override wifi sar with VPD.
-
config WIFI_SAR_CBFS_FILEPATH
string "The cbfs file which has WIFI SAR defaults"
- depends on WIFI_SAR_CBFS
- default "src/mainboard/\$(MAINBOARDDIR)/wifi_sar_defaults.hex"
+ depends on USE_SAR
+ default ""
config DSAR_SET_NUM
hex "Number of SAR sets when D-SAR is enabled"
diff --git a/src/drivers/wifi/generic/Makefile.inc b/src/drivers/wifi/generic/Makefile.inc
index c17844993d..5650d8ab6f 100644
--- a/src/drivers/wifi/generic/Makefile.inc
+++ b/src/drivers/wifi/generic/Makefile.inc
@@ -5,8 +5,14 @@ ramstage-y += generic.c
ramstage-$(CONFIG_GENERATE_SMBIOS_TABLES) += smbios.c
ramstage-$(CONFIG_HAVE_ACPI_TABLES) += acpi.c
-cbfs-files-$(CONFIG_WIFI_SAR_CBFS) += wifi_sar_defaults.hex
-wifi_sar_defaults.hex-file := $(call strip_quotes,$(CONFIG_WIFI_SAR_CBFS_FILEPATH))
+CONFIG_WIFI_SAR_CBFS_FILEPATH := $(call strip_quotes,$(CONFIG_WIFI_SAR_CBFS_FILEPATH))
+
+ifneq ($(CONFIG_WIFI_SAR_CBFS_FILEPATH),)
+
+cbfs-files-$(CONFIG_USE_SAR) += wifi_sar_defaults.hex
+wifi_sar_defaults.hex-file := $(CONFIG_WIFI_SAR_CBFS_FILEPATH)
wifi_sar_defaults.hex-type := raw
endif
+
+endif