diff options
| author | dianlujitao <dianlujitao@lineageos.org> | 2020-04-06 22:09:07 +0800 |
|---|---|---|
| committer | Michael Bestas <mkbestas@gmail.com> | 2020-04-18 03:50:18 +0300 |
| commit | 7d9ff3e4eaa2677f373c10d0d64e24a456f6fa29 (patch) | |
| tree | 9f7e666989645214b06fae51bc9b0979d4ac2a40 | |
| parent | c60c8253378fc8003fa244471168620bed4adeca (diff) | |
Revert "staging: qcacld-3.0: make debug functions configurable"
This reverts commit e675116caace683346c6aadd655a0adaf0677833.
| -rw-r--r-- | drivers/staging/qcacld-3.0/Kbuild | 22 | ||||
| -rw-r--r-- | drivers/staging/qcacld-3.0/Kconfig | 11 |
2 files changed, 21 insertions, 12 deletions
diff --git a/drivers/staging/qcacld-3.0/Kbuild b/drivers/staging/qcacld-3.0/Kbuild index a0f0e2dc50fd..d3096770adce 100644 --- a/drivers/staging/qcacld-3.0/Kbuild +++ b/drivers/staging/qcacld-3.0/Kbuild @@ -246,6 +246,26 @@ endif endif + +# As per target team, build is done as follows: +# Defconfig : build with default flags +# Slub : defconfig + CONFIG_SLUB_DEBUG=y + +# CONFIG_SLUB_DEBUG_ON=y + CONFIG_PAGE_POISONING=y +# Perf : Using appropriate msmXXXX-perf_defconfig +# +# Shipment builds (user variants) should not have any debug feature +# enabled. This is identified using 'TARGET_BUILD_VARIANT'. Slub builds +# are identified using the CONFIG_SLUB_DEBUG_ON configuration. Since +# there is no other way to identify defconfig builds, QCOMs internal +# representation of perf builds (identified using the string 'perf'), +# is used to identify if the build is a slub or defconfig one. This +# way no critical debug feature will be enabled for perf and shipment +# builds. Other OEMs are also protected using the TARGET_BUILD_VARIANT +# config. +ifneq ($(TARGET_BUILD_VARIANT),user) + CONFIG_FEATURE_PKTLOG := y +endif + #enable spectral scan feature CONFIG_WLAN_SPECTRAL_SCAN := y @@ -1500,7 +1520,7 @@ ifeq ($(CONFIG_WLAN_FEATURE_LPSS),y) CDEFINES += -DWLAN_FEATURE_LPSS endif -ifeq ($(CONFIG_QCA_CLD_DEBUG),y) +ifneq ($(TARGET_BUILD_VARIANT),user) CDEFINES += -DDESC_DUP_DETECT_DEBUG CDEFINES += -DDEBUG_RX_RING_BUFFER endif diff --git a/drivers/staging/qcacld-3.0/Kconfig b/drivers/staging/qcacld-3.0/Kconfig index 78729c64defb..0e581dd7460c 100644 --- a/drivers/staging/qcacld-3.0/Kconfig +++ b/drivers/staging/qcacld-3.0/Kconfig @@ -168,15 +168,4 @@ config WLAN_FW_THERMAL_MITIGATION bool "Enable FW thermal mitigation feature" default n -config FEATURE_PKTLOG - bool "Packet log" - default n - depends on SLUB_DEBUG - depends on SLUB_DEBUG_ON - depends on PAGE_POISONING - -config QCA_CLD_DEBUG - bool "Debug Qualcomm Atheros CLD WLAN module" - default n - endif # QCA_CLD_WLAN |