diff --git a/Kbuild b/Kbuild
index ec548089a2ad..bd6f0e178305 100644
--- a/Kbuild
+++ b/Kbuild
@@ -1946,9 +1946,9 @@ cppflags-$(CONFIG_WLAN_ENABLE_SOCIAL_CHANNELS_5G_ONLY) += -DWLAN_ENABLE_SOCIAL_C
 #Green AP feature
 cppflags-$(CONFIG_QCACLD_FEATURE_GREEN_AP) += -DWLAN_SUPPORT_GREEN_AP
 
-ifeq ($(CONFIG_QCACLD_FEATURE_APF), y)
 cppflags-$(CONFIG_QCACLD_FEATURE_APF) += -DFEATURE_WLAN_APF
-endif
+
+cppflags-$(CONFIG_WLAN_FEATURE_SARV1_TO_SARV2) += -DWLAN_FEATURE_SARV1_TO_SARV2
 
 #Stats & Quota Metering feature
 ifeq ($(CONFIG_IPA_OFFLOAD), y)
diff --git a/Kconfig b/Kconfig
index 40669d477711..bb65a842cdc8 100644
--- a/Kconfig
+++ b/Kconfig
@@ -132,7 +132,7 @@ config ICMP_DISABLE_PS
 	bool "Enable ICMP packet disable powersave feature"
 	default n
 
-config CONFIG_BUILD_TIMESTAMP
+config BUILD_TIMESTAMP
 	bool "Embed timestamp in wlan version"
 	default n
 
@@ -151,4 +151,9 @@ config WLAN_OBJMGR_DEBUG
 config WLAN_FEATURE_DFS_OFFLOAD
 	bool "Enable dfs offload feature"
 	default n
+
+config WLAN_FEATURE_SARV1_TO_SARV2
+	bool "Enable conversion of SAR v1 to v2 feature"
+	default n
+
 endif # QCA_CLD_WLAN
diff --git a/configs/default_defconfig b/configs/default_defconfig
index c20d8e8fdd59..eeee66c451b3 100644
--- a/configs/default_defconfig
+++ b/configs/default_defconfig
@@ -96,6 +96,9 @@ CONFIG_QCACLD_FEATURE_GREEN_AP := y
 #Flag to enable Android Packet Filtering
 CONFIG_QCACLD_FEATURE_APF := y
 
+#Flag to enable SARv1 -> SARv2 conversion
+CONFIG_WLAN_FEATURE_SARV1_TO_SARV2 := n
+
 ifeq ($(CONFIG_ARCH_MSM8998), y)
 CONFIG_QCACLD_FEATURE_METERING := y
 endif
diff --git a/configs/genoa.common b/configs/genoa.common
index 01deb86bf63a..7868788867b8 100644
--- a/configs/genoa.common
+++ b/configs/genoa.common
@@ -130,6 +130,9 @@ CONFIG_GTK_OFFLOAD := y
 endif
 CONFIG_QCACLD_FEATURE_APF := y
 
+#Flag to enable SARv1 -> SARv2 conversion
+CONFIG_WLAN_FEATURE_SARV1_TO_SARV2 := n
+
 ifneq ($(DEVELOPER_DISABLE_BUILD_TIMESTAMP), y)
 ifneq ($(WLAN_DISABLE_BUILD_TAG), y)
 CONFIG_BUILD_TAG := y