浏览代码

qcacld-3.0: Use new arch macro CONFIG_ARCH_SA515

Use the macro CONFIG_ARCH_SA515 instead of CONFIG_ARCH_SDXPRAIRIE
for SA515 projects.

Change-Id: If4d7d62a64c509fa69c2c59890ffaaf7b763e01c
CRs-Fixed: 2832357
Guisen Yang 4 年之前
父节点
当前提交
984527972c
共有 4 个文件被更改,包括 9 次插入9 次删除
  1. 4 4
      configs/default_defconfig
  2. 1 1
      configs/genoa.common
  3. 1 1
      configs/qca6174_defconfig
  4. 3 3
      configs/qca6390_defconfig

+ 4 - 4
configs/default_defconfig

@@ -160,7 +160,7 @@ ifeq ($(CONFIG_ARCH_SDX20), y)
 CONFIG_MOBILE_ROUTER := y
 endif
 
-ifeq ($(CONFIG_ARCH_SDXPRAIRIE), y)
+ifeq (y, $(filter y, $(CONFIG_ARCH_SDXPRAIRIE), $(CONFIG_ARCH_SA515)))
 CONFIG_MOBILE_ROUTER := y
 endif
 
@@ -670,7 +670,7 @@ CONFIG_FEATURE_WLAN_AUTO_SHUTDOWN := y
 CONFIG_FEATURE_WLAN_AP_AP_ACS_OPTIMIZE := y
 CONFIG_FEATURE_WLAN_STA_4ADDR_SCHEME := y
 CONFIG_MDM_PLATFORM := y
-ifneq ($(CONFIG_ARCH_SDXPRAIRIE), y)
+ifneq (y, $(filter y, $(CONFIG_ARCH_SDXPRAIRIE), $(CONFIG_ARCH_SA515)))
 CONFIG_FEATURE_WLAN_STA_AP_MODE_DFS_DISABLE := y
 endif
 CONFIG_FEATURE_AP_MCC_CH_AVOIDANCE := y
@@ -819,7 +819,7 @@ endif
 endif
 endif
 
-ifeq ($(CONFIG_ARCH_SDXPRAIRIE), y)
+ifeq (y, $(filter y, $(CONFIG_ARCH_SDXPRAIRIE), $(CONFIG_ARCH_SA515)))
 ifeq ($(CONFIG_IPA_OFFLOAD), y)
 CONFIG_ENABLE_SMMU_S1_TRANSLATION := y
 CONFIG_SMMU_S1_UNMAP := y
@@ -1073,7 +1073,7 @@ ifeq ($(CONFIG_ARCH_MSM8996), y)
 CONFIG_CHANNEL_HOPPING_ALL_BANDS := y
 endif
 
-ifeq ($(CONFIG_ARCH_SDXPRAIRIE), y)
+ifeq (y, $(filter y, $(CONFIG_ARCH_SDXPRAIRIE), $(CONFIG_ARCH_SA515)))
 	ifneq ($(CONFIG_SLUB_DEBUG), y)
 		CONFIG_DP_TRACE := n
 	endif

+ 1 - 1
configs/genoa.common

@@ -239,7 +239,7 @@ CONFIG_WLAN_FW_OFFLOAD := y
 #Enable PCIe Shadow Register
 CONFIG_QCN7605_PCIE_SHADOW_REG_SUPPORT := y
 
-ifeq ($(CONFIG_ARCH_SDXPRAIRIE), y)
+ifeq (y, $(filter y, $(CONFIG_ARCH_SDXPRAIRIE), $(CONFIG_ARCH_SA515)))
 CONFIG_MOBILE_ROUTER := y
 endif
 

+ 1 - 1
configs/qca6174_defconfig

@@ -63,7 +63,7 @@ ifeq ($(CONFIG_ARCH_SDX20), y)
 CONFIG_MOBILE_ROUTER := y
 endif
 
-ifeq ($(CONFIG_ARCH_SDXPRAIRIE), y)
+ifeq (y, $(filter y, $(CONFIG_ARCH_SDXPRAIRIE), $(CONFIG_ARCH_SA515)))
 CONFIG_MOBILE_ROUTER := y
 endif
 

+ 3 - 3
configs/qca6390_defconfig

@@ -87,7 +87,7 @@ ifeq ($(CONFIG_ARCH_SDX20), y)
 CONFIG_MOBILE_ROUTER := y
 endif
 
-ifeq ($(CONFIG_ARCH_SDXPRAIRIE), y)
+ifeq (y, $(filter y, $(CONFIG_ARCH_SDXPRAIRIE), $(CONFIG_ARCH_SA515)))
 CONFIG_MOBILE_ROUTER := y
 endif
 
@@ -542,7 +542,7 @@ endif
 endif
 
 #Flag to enable SMMU S1 support
-ifeq ($(CONFIG_ARCH_SDXPRAIRIE), y)
+ifeq (y, $(filter y, $(CONFIG_ARCH_SDXPRAIRIE), $(CONFIG_ARCH_SA515)))
 ifeq ($(CONFIG_IPA_OFFLOAD), y)
 CONFIG_ENABLE_SMMU_S1_TRANSLATION := y
 endif
@@ -737,7 +737,7 @@ ifeq ($(CONFIG_ARCH_MSM8996), y)
 CONFIG_CHANNEL_HOPPING_ALL_BANDS := y
 endif
 
-ifeq ($(CONFIG_ARCH_SDXPRAIRIE), y)
+ifeq (y, $(filter y, $(CONFIG_ARCH_SDXPRAIRIE), $(CONFIG_ARCH_SA515)))
 	CONFIG_FEATURE_MONITOR_MODE_SUPPORT := n
 	ifneq ($(CONFIG_SLUB_DEBUG), y)
 		CONFIG_DP_TRACE := n