From f223863261bbe73113f94ec3fee200b19fdce24c Mon Sep 17 00:00:00 2001 From: Furquan Shaikh Date: Sun, 4 Oct 2020 17:45:22 -0700 Subject: [PATCH] wifi: Move addition of CBFS SAR file to wifi/generic/Makefile.inc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This change moves the addition of CBFS SAR file from intel/wifi/Makefile.inc to wifi/generic/Makefile.inc to keep it in the same sub-directory as the Kconfig definition. BUG=b:169802515 BRANCH=zork Change-Id: I7ee33232b6a07bbf929f3a79fabe89130fb6fa6f Signed-off-by: Furquan Shaikh Reviewed-on: https://review.coreboot.org/c/coreboot/+/46039 Tested-by: build bot (Jenkins) Reviewed-by: Michael Niewöhner Reviewed-by: Martin Roth Reviewed-by: Rob Barnes Reviewed-by: Karthik Ramasubramanian --- src/drivers/intel/wifi/Makefile.inc | 4 ---- src/drivers/wifi/generic/Makefile.inc | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/drivers/intel/wifi/Makefile.inc b/src/drivers/intel/wifi/Makefile.inc index 57f60afb99..9bfdd79376 100644 --- a/src/drivers/intel/wifi/Makefile.inc +++ b/src/drivers/intel/wifi/Makefile.inc @@ -1,7 +1,3 @@ # SPDX-License-Identifier: GPL-2.0-only ramstage-$(CONFIG_DRIVERS_INTEL_WIFI) += wifi.c - -cbfs-files-$(CONFIG_WIFI_SAR_CBFS) += wifi_sar_defaults.hex -wifi_sar_defaults.hex-file := $(call strip_quotes,$(CONFIG_WIFI_SAR_CBFS_FILEPATH)) -wifi_sar_defaults.hex-type := raw diff --git a/src/drivers/wifi/generic/Makefile.inc b/src/drivers/wifi/generic/Makefile.inc index 6240c7146a..407041afce 100644 --- a/src/drivers/wifi/generic/Makefile.inc +++ b/src/drivers/wifi/generic/Makefile.inc @@ -1 +1,5 @@ ramstage-$(CONFIG_DRIVERS_WIFI_GENERIC) += generic.c + +cbfs-files-$(CONFIG_WIFI_SAR_CBFS) += wifi_sar_defaults.hex +wifi_sar_defaults.hex-file := $(call strip_quotes,$(CONFIG_WIFI_SAR_CBFS_FILEPATH)) +wifi_sar_defaults.hex-type := raw