diff --git a/Kbuild b/Kbuild
index 049fc4df3a1f..302fcaa58915 100644
--- a/Kbuild
+++ b/Kbuild
@@ -545,6 +545,10 @@ CONFIG_FEATURE_WLAN_D0WOW := y
 endif
 endif
 
+ifeq ($(CONFIG_ARCH_MSM8996), y)
+CONFIG_CHANNEL_HOPPING_ALL_BANDS := y
+endif
+
 ifneq ($(CONFIG_HIF_USB), y)
 CONFIG_WLAN_LOGGING_SOCK_SVC := y
 endif
@@ -2292,9 +2296,7 @@ ifeq ($(CONFIG_ARCH_MDM9607), y)
 ccflags-y += -DCONFIG_TUFELLO_DUAL_FW_SUPPORT
 endif
 
-ifeq ($(CONFIG_ARCH_MSM8996), y)
-ccflags-y += -DCHANNEL_HOPPING_ALL_BANDS
-endif
+ccflags-$(CONFIG_CHANNEL_HOPPING_ALL_BANDS) += -DCHANNEL_HOPPING_ALL_BANDS
 
 #Enable Signed firmware support for split binary format
 ccflags-$(CONFIG_QCA_SIGNED_SPLIT_BINARY_SUPPORT) += -DQCA_SIGNED_SPLIT_BINARY_SUPPORT