Browse Source

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
Jeff Johnson 4 years ago
parent
commit
ab72992beb
1 changed files with 10 additions and 6 deletions
  1. 10 6
      Kbuild

+ 10 - 6
Kbuild

@@ -1732,8 +1732,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
@@ -1744,6 +1749,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 \
@@ -2599,10 +2606,7 @@ OBJS +=		$(DP_OBJS)
 endif
 
 OBJS += 	$(UMAC_INTERFACE_MGR_OBJS)
-
-ifeq ($(CONFIG_WLAN_FEATURE_DP_RX_THREADS), y)
-OBJS += $(TXRX3.0_OBJS)
-endif
+OBJS +=		$(TXRX3.0_OBJS)
 
 ccflags-y += $(INCS)