From addb7e7a6fc8716ac86725aa02b0dfcb3b23f888 Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Tue, 19 Jan 2021 16:10:15 -0800 Subject: [PATCH] qcacld-3.0: Kbuild: Refactor ol_txrx_event.o rule There are currently two different places where ol_txrx_event.o is added to the final target object list. As part of ongoing Makefile cleanup consolidate these to a single location. Change-Id: Id342ae771830f5fd4d65c6c5523c36f1e50bc941 CRs-Fixed: 2867841 --- Kbuild | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/Kbuild b/Kbuild index 99e04ebb303f..1216b954b13d 100644 --- a/Kbuild +++ b/Kbuild @@ -1592,8 +1592,13 @@ FWLOG_OBJS := $(FWLOG_DIR)/dbglog_host.o TXRX_DIR := core/dp/txrx TXRX_INC := -I$(WLAN_ROOT)/$(TXRX_DIR) +TXRX_OBJS := +ifeq ($(CONFIG_WDI_EVENT_ENABLE), y) +TXRX_OBJS += $(TXRX_DIR)/ol_txrx_event.o +endif + ifneq ($(CONFIG_LITHIUM), y) -TXRX_OBJS := $(TXRX_DIR)/ol_txrx.o \ +TXRX_OBJS += $(TXRX_DIR)/ol_txrx.o \ $(TXRX_DIR)/ol_cfg.o \ $(TXRX_DIR)/ol_rx.o \ $(TXRX_DIR)/ol_rx_fwd.o \ @@ -1608,10 +1613,6 @@ TXRX_OBJS := $(TXRX_DIR)/ol_txrx.o \ $(TXRX_DIR)/ol_txrx_encap.o \ $(TXRX_DIR)/ol_tx_send.o -ifeq ($(CONFIG_WDI_EVENT_ENABLE), y) -TXRX_OBJS += $(TXRX_DIR)/ol_txrx_event.o -endif - ifeq ($(CONFIG_LL_DP_SUPPORT), y) TXRX_OBJS += $(TXRX_DIR)/ol_tx_ll.o @@ -2422,9 +2423,6 @@ endif ifeq ($(CONFIG_LITHIUM), y) OBJS += $(HAL_OBJS) -ifeq ($(CONFIG_WDI_EVENT_ENABLE), y) -OBJS += $(TXRX_DIR)/ol_txrx_event.o -endif endif ifeq ($(CONFIG_FEATURE_FW_LOG_PARSING), y)