[coreboot-gerrit] New patch to review for coreboot: driver/intel/wifi: Fix Makefile.inc

[Naresh Solanki (naresh.solanki@intel.com)]

Naresh Solanki (naresh.solanki at intel.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/15836

-gerrit

commit 51ce10822819e66f60154cdeb407a69397e4cbc8
Author: Naresh G Solanki <naresh.solanki at intel.com>
Date:   Mon Jul 25 18:01:45 2016 +0530

    driver/intel/wifi: Fix Makefile.inc
    
    Makefile.inc should include wifi.c when DRIVERS_INTEL_WIFI is selected,
    Also include function 'smbios_write_wifi' if GENERATE_SMBIOS_TABLES is selected
    
    Change-Id: Ifacd865a043e6a074bdb72cdba299681fa7ec7a9
    Signed-off-by: Naresh G Solanki <naresh.solanki at intel.com>
---
 src/drivers/intel/wifi/Makefile.inc | 7 +------
 src/drivers/intel/wifi/wifi.c       | 4 ++++
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/drivers/intel/wifi/Makefile.inc b/src/drivers/intel/wifi/Makefile.inc
index 1435f8b..aab811c 100644
--- a/src/drivers/intel/wifi/Makefile.inc
+++ b/src/drivers/intel/wifi/Makefile.inc
@@ -11,9 +11,4 @@
 # GNU General Public License for more details.
 #
 
-# really?
-ifeq ($(CONFIG_GENERATE_SMBIOS_TABLES),y)
-
-ramstage-$(CONFIG_PCIEXP_PLUGIN_SUPPORT) += wifi.c
-
-endif
+ramstage-$(CONFIG_DRIVERS_INTEL_WIFI) += wifi.c
diff --git a/src/drivers/intel/wifi/wifi.c b/src/drivers/intel/wifi/wifi.c
index 5661bf4..789d0d5 100644
--- a/src/drivers/intel/wifi/wifi.c
+++ b/src/drivers/intel/wifi/wifi.c
@@ -25,6 +25,7 @@
 #include <wrdd.h>
 #include "chip.h"
 
+#if IS_ENABLED(CONFIG_GENERATE_SMBIOS_TABLES)
 static int smbios_write_wifi(struct device *dev, int *handle,
 			     unsigned long *current)
 {
@@ -55,6 +56,7 @@ static int smbios_write_wifi(struct device *dev, int *handle,
 	*handle += 1;
 	return len;
 }
+#endif
 
 #if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES)
 static void intel_wifi_fill_ssdt(struct device *dev)
@@ -125,7 +127,9 @@ struct device_operations device_ops = {
 	.set_resources            = pci_dev_set_resources,
 	.enable_resources         = pci_dev_enable_resources,
 	.init                     = pci_dev_init,
+#if IS_ENABLED(CONFIG_GENERATE_SMBIOS_TABLES)
 	.get_smbios_data          = smbios_write_wifi,
+#endif
 	.ops_pci                  = &pci_ops,
 #if IS_ENABLED(CONFIG_HAVE_ACPI_TABLES)
 	.acpi_name                = &intel_wifi_acpi_name,