Browse Source

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
Visudha Sathurappan 6 years ago
parent
commit
669c33eea5
1 changed files with 13 additions and 8 deletions
  1. 13 8
      spectral/Kbuild

+ 13 - 8
spectral/Kbuild

@@ -60,14 +60,14 @@ INCS += -I$(obj)/$(DEPTH)/include -I$(obj)/$(DEPTH)/umac/include \
         -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/cmn_services/mgmt_txrx/dispatcher/inc
 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 @@ ifeq ($(strip ${DA_SUPPORT}),1)
 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