diff --git a/qcom/opensource/wlan/platform/Kbuild b/qcom/opensource/wlan/platform/Kbuild
index 66536fcecf..4d518c7114 100644
--- a/qcom/opensource/wlan/platform/Kbuild
+++ b/qcom/opensource/wlan/platform/Kbuild
@@ -1,3 +1,10 @@
+include \
+	$(WLAN_PLATFORM_ROOT)/cnss2/sun_gki_defconfig \
+	$(WLAN_PLATFORM_ROOT)/cnss_genl/sun_gki_defconfig \
+	$(WLAN_PLATFORM_ROOT)/cnss_prealloc/sun_gki_defconfig \
+	$(WLAN_PLATFORM_ROOT)/cnss_utils/sun_gki_defconfig
+
+
 ifeq ($(CONFIG_CNSS_OUT_OF_TREE),y)
 KBUILD_CPPFLAGS += -DCONFIG_CNSS_OUT_OF_TREE
 endif
diff --git a/qcom/opensource/wlan/platform/Makefile b/qcom/opensource/wlan/platform/Makefile
index b9757ab27f..cdbcd1fee2 100644
--- a/qcom/opensource/wlan/platform/Makefile
+++ b/qcom/opensource/wlan/platform/Makefile
@@ -5,6 +5,8 @@ M ?= $(shell pwd)
 ifeq ($(WLAN_PLATFORM_ROOT),)
 WLAN_PLATFORM_ROOT = $(shell pwd)
 
+USE_EXTERNAL_CONFIGS := y
+
 # If it reaches here, compilation is probably without Android.mk,
 # so enable all flags (including debug flag CONFIG_CNSS2_DEBUG) by
 # default.
diff --git a/qcom/opensource/wlan/platform/cnss2/Makefile b/qcom/opensource/wlan/platform/cnss2/Makefile
index 555bac52fe..6860ff527c 100644
--- a/qcom/opensource/wlan/platform/cnss2/Makefile
+++ b/qcom/opensource/wlan/platform/cnss2/Makefile
@@ -1,5 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only
 
+include $(WLAN_PLATFORM_ROOT)/cnss2/sun_gki_defconfig
 ccflags-y += -Wmissing-prototypes
 
 ifeq ($(CONFIG_CNSS_OUT_OF_TREE),y)
diff --git a/qcom/opensource/wlan/platform/cnss_genl/Makefile b/qcom/opensource/wlan/platform/cnss_genl/Makefile
index 4dc3700d82..074e6163a7 100644
--- a/qcom/opensource/wlan/platform/cnss_genl/Makefile
+++ b/qcom/opensource/wlan/platform/cnss_genl/Makefile
@@ -1,5 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only
 
+include $(WLAN_PLATFORM_ROOT)/cnss_genl/sun_gki_defconfig
 ccflags-y += -Wmissing-prototypes
 
 ifeq ($(CONFIG_CNSS_OUT_OF_TREE),y)
diff --git a/qcom/opensource/wlan/platform/cnss_prealloc/Makefile b/qcom/opensource/wlan/platform/cnss_prealloc/Makefile
index 2bfc825e41..88691d03af 100644
--- a/qcom/opensource/wlan/platform/cnss_prealloc/Makefile
+++ b/qcom/opensource/wlan/platform/cnss_prealloc/Makefile
@@ -1,5 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only
 
+include $(WLAN_PLATFORM_ROOT)/cnss_prealloc/sun_gki_defconfig
 ccflags-y += -Wmissing-prototypes
 
 ifeq ($(CONFIG_CNSS_OUT_OF_TREE),y)
diff --git a/qcom/opensource/wlan/platform/cnss_utils/Makefile b/qcom/opensource/wlan/platform/cnss_utils/Makefile
index 72a3e5be6b..b8b06d8832 100644
--- a/qcom/opensource/wlan/platform/cnss_utils/Makefile
+++ b/qcom/opensource/wlan/platform/cnss_utils/Makefile
@@ -1,10 +1,12 @@
 # SPDX-License-Identifier: GPL-2.0-only
 
+include $(WLAN_PLATFORM_ROOT)/cnss_utils/sun_gki_defconfig
 ccflags-y += -Wmissing-prototypes
 
 ifeq ($(CONFIG_CNSS_OUT_OF_TREE),y)
 ccflags-y += -I$(WLAN_PLATFORM_ROOT)/inc
 endif
+ccflags-$(CONFIG_FEATURE_SMEM_MAILBOX) += -DCONFIG_FEATURE_SMEM_MAILBOX
 
 obj-$(CONFIG_CNSS_UTILS) += cnss_utils.o