qcacld-3.0: Kbuild: Relocate HELIUMPLUS definitions
Currently if the driver is built directly within the kernel the
following Kconfig parameters will NOT be taken from the kernel
configuration:
- CONFIG_HELIUMPLUS
- CONFIG_64BIT_PADDR
- CONFIG_FEATURE_TSO
- CONFIG_FEATURE_TSO_DEBUG
Inversely, if the driver is built outside the kernel the following
parameter does not enforce the "depends on HELIUMPLUS" that is found
in the Kconfig:
- CONFIG_WLAN_LRO
Resolve these issues by relocating the HELIUMPLUS definition to inside
the "ifeq ($(KERNEL_BUILD), n)" portion of the Kbuild, and relocating
the other configurations such that they only get initialized when
HELIUMPLUS is enabled.
Change-Id: Ie41cd0a59bfa39fed39779e508bebbd6e29f6c0c
CRs-Fixed: 2222020
diff --git a/Kbuild b/Kbuild
index 9b12f27..6cba2a3 100644
--- a/Kbuild
+++ b/Kbuild
@@ -48,6 +48,18 @@
# These are configurable via Kconfig for kernel-based builds
# Need to explicitly configure for Android-based builds
+ ifeq (y,$(filter y,$(CONFIG_CNSS_EOS) $(CONFIG_ICNSS)))
+ CONFIG_HELIUMPLUS := y
+ CONFIG_64BIT_PADDR := y
+ CONFIG_FEATURE_TSO := y
+ CONFIG_FEATURE_TSO_DEBUG := y
+ ifeq ($(CONFIG_INET_LRO), y)
+ CONFIG_WLAN_LRO := y
+ else
+ CONFIG_WLAN_LRO := n
+ endif
+ endif
+
ifneq ($(DEVELOPER_DISABLE_BUILD_TIMESTAMP), y)
ifneq ($(WLAN_DISABLE_BUILD_TAG), y)
CONFIG_BUILD_TAG := y
@@ -193,12 +205,6 @@
CONFIG_WLAN_TX_FLOW_CONTROL_V2 := n
endif
- # Flag to enable LRO (Large Receive Offload)
- ifeq ($(CONFIG_INET_LRO), y)
- CONFIG_WLAN_LRO := y
- else
- CONFIG_WLAN_LRO := n
- endif
endif
endif
@@ -405,11 +411,7 @@
CONFIG_CP_STATS := y
-ifeq (y,$(filter y,$(CONFIG_CNSS_EOS) $(CONFIG_ICNSS)))
-CONFIG_HELIUMPLUS := y
-CONFIG_64BIT_PADDR := y
-CONFIG_FEATURE_TSO := y
-CONFIG_FEATURE_TSO_DEBUG := y
+ifeq ($(CONFIG_HELIUMPLUS), y)
ifneq ($(CONFIG_FORCE_ALLOC_FROM_DMA_ZONE), y)
CONFIG_ENABLE_DEBUG_ADDRESS_MARKING := y
endif