From 7842d0ea1ed0f963df4018294d9f5e67262b3288 Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Thu, 21 Jan 2021 14:28:08 -0800 Subject: [PATCH] qcacld-3.0: Kbuild: Cleanup TXRX3.0_OBJS logic Currently TXRX3.0_OBJS are added to the OBJS aggregation only when CONFIG_WLAN_FEATURE_DP_RX_THREADS is enabled. However only one of the object files, dp_rx_thread.o, should be controlled by that feature. Update the logic to conditionally add dp_rx_thread.o to TXRX3.0_OBJS, to encapsulate all TXRX3.0_OBJS assignments within CONFIG_LITHIUM, and unconditionally add TXRX3.0_OBJS to OBJS. Change-Id: I6ceeafeab43a960277a1870daff5566288199ada CRs-Fixed: 2867843 --- Kbuild | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/Kbuild b/Kbuild index 1216b954b13d..c303a8358185 100644 --- a/Kbuild +++ b/Kbuild @@ -1652,8 +1652,13 @@ endif #LITHIUM ############ TXRX 3.0 ############ TXRX3.0_DIR := core/dp/txrx3.0 TXRX3.0_INC := -I$(WLAN_ROOT)/$(TXRX3.0_DIR) -TXRX3.0_OBJS := $(TXRX3.0_DIR)/dp_txrx.o \ - $(TXRX3.0_DIR)/dp_rx_thread.o + +ifeq ($(CONFIG_LITHIUM), y) +TXRX3.0_OBJS := $(TXRX3.0_DIR)/dp_txrx.o + +ifeq ($(CONFIG_WLAN_FEATURE_DP_RX_THREADS), y) +TXRX3.0_OBJS += $(TXRX3.0_DIR)/dp_rx_thread.o +endif ifeq ($(CONFIG_RX_FISA), y) TXRX3.0_OBJS += $(TXRX3.0_DIR)/dp_fisa_rx.o @@ -1664,6 +1669,8 @@ ifeq ($(CONFIG_DP_SWLM), y) TXRX3.0_OBJS += $(TXRX3.0_DIR)/dp_swlm.o endif +endif #LITHIUM + ifeq ($(CONFIG_LITHIUM), y) ############ DP 3.0 ############ DP_INC := -I$(WLAN_COMMON_INC)/dp/inc \ @@ -2518,10 +2525,7 @@ endif ifeq ($(CONFIG_INTERFACE_MGR), y) OBJS += $(UMAC_INTERFACE_MGR_OBJS) endif - -ifeq ($(CONFIG_WLAN_FEATURE_DP_RX_THREADS), y) -OBJS += $(TXRX3.0_OBJS) -endif +OBJS += $(TXRX3.0_OBJS) ccflags-y += $(INCS)