intel/wifi: Include conditionally in the build
Keep this enabled by default as most x86 platforms could have PCI-e slots equipped with one of these Intel WiFi adapters. The Kconfig entries under google boards had no function previously, the variable was never referenced. Change-Id: I728ce3fd83d51d4e5e32b848a2079c5fcee29349 Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: https://review.coreboot.org/15931 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Reviewed-by: Duncan Laurie <dlaurie@chromium.org>
This commit is contained in:
parent
783d0c146f
commit
828e73e0b6
|
@ -0,0 +1,6 @@
|
|||
config DRIVERS_INTEL_WIFI
|
||||
bool "Support Intel PCI-e WiFi adapters"
|
||||
default y if PCIEXP_PLUGIN_SUPPORT
|
||||
help
|
||||
When enabled, add identifiers in ACPI and SMBIOS tables to
|
||||
make OS drivers work with certain Intel PCI-e WiFi chipsets.
|
|
@ -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
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -28,9 +28,6 @@ config DRIVERS_I2C_GENERIC
|
|||
config DRIVERS_I2C_NAU8825
|
||||
def_bool y
|
||||
|
||||
config DRIVERS_INTEL_WIFI
|
||||
def_bool y
|
||||
|
||||
config IRQ_SLOT_COUNT
|
||||
int
|
||||
default 18
|
||||
|
|
|
@ -28,9 +28,6 @@ config DRIVERS_I2C_GENERIC
|
|||
config DRIVERS_I2C_NAU8825
|
||||
def_bool y
|
||||
|
||||
config DRIVERS_INTEL_WIFI
|
||||
def_bool y
|
||||
|
||||
config IRQ_SLOT_COUNT
|
||||
int
|
||||
default 18
|
||||
|
|
|
@ -32,9 +32,6 @@ config DRIVERS_I2C_GENERIC
|
|||
config DRIVERS_I2C_NAU8825
|
||||
default y
|
||||
|
||||
config DRIVERS_INTEL_WIFI
|
||||
default y
|
||||
|
||||
config IRQ_SLOT_COUNT
|
||||
int
|
||||
default 18
|
||||
|
|
|
@ -31,9 +31,6 @@ config DRIVERS_I2C_GENERIC
|
|||
config DRIVERS_I2C_NAU8825
|
||||
default y
|
||||
|
||||
config DRIVERS_INTEL_WIFI
|
||||
default y
|
||||
|
||||
config IRQ_SLOT_COUNT
|
||||
int
|
||||
default 18
|
||||
|
|
Loading…
Reference in New Issue