commit 669c33eea586ab52c872f327e1c191fed70aeef2
author Visudha Sathurappan <vsathura@codeaurora.org> Wed Nov 07 15:31:51 2018 +0530
committer nshrivas <nshrivas@codeaurora.org> Sat Nov 10 22:50:01 2018 -0800
tree 4e568fc3696dd5a9b64847956926eea6188aaa00
parent 5f7f131a9de6291003c67a3f83561fc37ce6bdcc

qcacmn: Move lmac files to DA directory

* Since LMAC files are moved to direct attach directory
  specral Kbuild changes are made.
* Spectral DA objects are conditionally compiled.

Change-Id: I8724af4b9511539566485e91e05de88c8eb0435c

spectral/Kbuild

diff --git a/spectral/Kbuild b/spectral/Kbuild
index ef16cce..83fa619 100644
--- a/spectral/Kbuild
+++ b/spectral/Kbuild
@@ -60,14 +60,14 @@
         -I$(obj)/$(DEPTH)/umac/rpt_placement \
         -I$(obj)/$(DEPTH)/umac/wifipos \
         -I$(obj)/$(DEPTH)/umac/wds -I$(obj)/$(DEPTH)/umac/ique \
-        -I$(obj)/$(DEPTH)/hal -I$(obj)/$(DEPTH)/lmac/ath_dev \
+        -I$(obj)/$(DEPTH)/hal -I$(obj)/$(DEPTH)/direct_attach/lmac/ath_dev \
         -I$(obj)/$(DEPTH)/hal/$(OS) \
         -I$(obj)/$(DEPTH)/umac/vi_dbg \
         -I$(obj)/$(DEPTH)/umac/smart_antenna \
         -I$(obj)/$(DEPTH)/umac/smart_ant \
         -I$(obj)/$(DEPTH)/umac/ald \
-        -I$(obj)/$(DEPTH)/lmac/ath_pktlog \
-        -I$(obj)/$(DEPTH)/lmac/ratectrl \
+        -I$(obj)/$(DEPTH)/direct_attach/lmac/ath_pktlog \
+        -I$(obj)/$(DEPTH)/direct_attach/lmac/ratectrl \
         -I$(obj)/$(DEPTH)/os/linux/mem/ \
         -I$(obj)/$(DEPTH)/umac/base \
         -I$(obj)/$(DEPTH)/qca_ol \
@@ -162,11 +162,11 @@
 INCS += -I$(obj)/$(DEPTH)/cmn_dev/umac/regulatory/dispatcher/inc
 INCS += -I$(obj)/$(DEPTH)/cmn_dev/umac/dfs/dispatcher/inc
 
-SPECTRAL_DA_OBJS := $(DEPTH)/lmac/spectral/spectral.o \
-                    $(DEPTH)/lmac/spectral/spectral_netlink.o \
-                    $(DEPTH)/lmac/spectral/spectral_cmds.o \
-                    $(DEPTH)/lmac/spectral/spectral_process_data.o \
-                    $(DEPTH)/lmac/spectral/spectral_phyerr.o
+SPECTRAL_DA_OBJS := $(DEPTH)/direct_attach/lmac/spectral/spectral.o \
+                    $(DEPTH)/direct_attach/lmac/spectral/spectral_netlink.o \
+                    $(DEPTH)/direct_attach/lmac/spectral/spectral_cmds.o \
+                    $(DEPTH)/direct_attach/lmac/spectral/spectral_process_data.o \
+                    $(DEPTH)/direct_attach/lmac/spectral/spectral_phyerr.o
 #End of legacy spectral defines
 
 ifeq ($(QCA_AIRTIME_FAIRNESS), 1)
@@ -211,9 +211,14 @@
 SPECTRAL_CMN_OBJS +=  $(DEPTH)/component_dev/direct_attach/spectral/core/spectral_direct_attach.o
 endif
 
+ifeq ($(strip ${DA_SUPPORT}),1)
 qca_spectral-objs +=  ${SPECTRAL_CMN_OBJS} \
                       ${SPECTRAL_TIF_OBJS} \
                       ${SPECTRAL_DA_OBJS}
+else
+qca_spectral-objs +=  ${SPECTRAL_CMN_OBJS} \
+                      ${SPECTRAL_TIF_OBJS}
+endif
 
 ifeq ($(strip ${QCA_PARTNER_MAKE_F_SUPPORT}),1)
 all: qca_spectral.ko