From 2dfb4b04e41eddbe9c11a3a8c3877277eee21a23 Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Mon, 1 Feb 2021 14:03:19 -0800 Subject: [PATCH] qcacld-3.0: Kbuild: Cleanup FWLOG_OBJS logic Currently FWLOG_OBJS are added to OBJS when CONFIG_FEATURE_FW_LOG_PARSING is enabled. An upcoming change requires that assignments to OBJS be unconditional, so relocate the condition to wrap the assignment of FWLOG_OBJS. Change-Id: I6b09d9dfa2553943d3bb4370dc1977106a14a7d5 CRs-Fixed: 2868006 --- Kbuild | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Kbuild b/Kbuild index b6318c2cdf88..007f2de40c4e 100644 --- a/Kbuild +++ b/Kbuild @@ -1600,7 +1600,9 @@ FWLOG_DIR := $(WLAN_COMMON_ROOT)/utils/fwlog FWLOG_INC := -I$(WLAN_ROOT)/$(FWLOG_DIR) +ifeq ($(CONFIG_FEATURE_FW_LOG_PARSING), y) FWLOG_OBJS := $(FWLOG_DIR)/dbglog_host.o +endif ############ TXRX ############ TXRX_DIR := core/dp/txrx @@ -2449,10 +2451,7 @@ ifeq ($(CONFIG_LITHIUM), y) OBJS += $(HAL_OBJS) endif -ifeq ($(CONFIG_FEATURE_FW_LOG_PARSING), y) -OBJS += $(FWLOG_OBJS) -endif - +OBJS += $(FWLOG_OBJS) OBJS += $(EPPING_OBJS) OBJS += $(DFS_OBJS) OBJS += $(UMAC_OBJMGR_OBJS)