浏览代码

qcacld-3.0: Kbuild: Cleanup DP_OBJS logic

Currently DP_OBJS are added to OBJS when CONFIG_LITHIUM is enabled.
An upcoming change requires that assignments to OBJS be unconditional.
Fortunately most of the assignments to DP_OBJS are already protected
by this feature. Update the logic so that all of the assignments are
protected, and remove the condition from the OBJS assignment.

Change-Id: Icc7d015831d8940bf1d91335be1439a70965801f
CRs-Fixed: 2867900
Jeff Johnson 4 年之前
父节点
当前提交
56ad171f1c
共有 1 个文件被更改,包括 2 次插入4 次删除
  1. 2 4
      Kbuild

+ 2 - 4
Kbuild

@@ -1780,7 +1780,6 @@ endif
 ifeq ($(CONFIG_WLAN_FEATURE_RX_BUFFER_POOL), y)
 DP_OBJS += $(DP_SRC)/dp_rx_buffer_pool.o
 endif
-endif
 
 ifeq ($(CONFIG_IPA_OFFLOAD), y)
 DP_OBJS +=     $(DP_SRC)/dp_ipa.o
@@ -1790,6 +1789,8 @@ ifeq ($(CONFIG_WDI_EVENT_ENABLE), y)
 DP_OBJS +=     $(DP_SRC)/dp_wdi_event.o
 endif
 
+endif #LITHIUM
+
 ############ CFG ############
 WCFG_DIR := wlan_cfg
 WCFG_INC := -I$(WLAN_COMMON_INC)/$(WCFG_DIR)
@@ -2601,10 +2602,7 @@ ifeq ($(CONFIG_CRYPTO_COMPONENT), y)
 OBJS +=		$(UMAC_CRYPTO_OBJS)
 endif
 
-ifeq ($(CONFIG_LITHIUM), y)
 OBJS +=		$(DP_OBJS)
-endif
-
 OBJS += 	$(UMAC_INTERFACE_MGR_OBJS)
 OBJS +=		$(TXRX3.0_OBJS)