diff --git a/build.config.msm.kona b/build.config.msm.kona
new file mode 100644
index 000000000000..c0003472704d
--- /dev/null
+++ b/build.config.msm.kona
@@ -0,0 +1,35 @@
+################################################################################
+## Inheriting configs from ACK
+. ${ROOT_DIR}/msm-kernel/build.config.common
+. ${ROOT_DIR}/msm-kernel/build.config.aarch64
+
+################################################################################
+## Variant setup
+MSM_ARCH=kona
+VARIANTS=(consolidate gki)
+[ -z "${VARIANT}" ] && VARIANT=consolidate
+
+ABL_SRC=bootable/bootloader/edk2
+BOOT_IMAGE_HEADER_VERSION=4
+BASE_ADDRESS=0x80000000
+PAGE_SIZE=4096
+BUILD_VENDOR_DLKM=1
+PREPARE_SYSTEM_DLKM=1
+SYSTEM_DLKM_MODULES_LIST=${ROOT_DIR}/${KERNEL_DIR}/android/gki_system_dlkm_modules
+SUPER_IMAGE_SIZE=0x10000000
+TRIM_UNUSED_MODULES=1
+BUILD_INIT_BOOT_IMG=1
+
+MODULES_LIST_ORDER="1"
+[ -z "${DT_OVERLAY_SUPPORT}" ] && DT_OVERLAY_SUPPORT=1
+
+if [ "${KERNEL_CMDLINE_CONSOLE_AUTO}" != "0" ]; then
+	KERNEL_VENDOR_CMDLINE+=' console=ttyMSM0,115200n8 earlycon=qcom_geni,0xa90000 qcom_geni_serial.con_enabled=1 '
+fi
+
+KERNEL_VENDOR_CMDLINE+=' bootconfig '
+
+################################################################################
+## Inheriting MSM configs
+. ${KERNEL_DIR}/build.config.msm.common
+. ${KERNEL_DIR}/build.config.msm.gki
diff --git a/build.targets b/build.targets
index 81d15ee57856..6be6cce4f2e6 100644
--- a/build.targets
+++ b/build.targets
@@ -11,3 +11,4 @@ build.config.msm.sdxbaagha
 build.config.msm.bengal
 build.config.msm.sa410m
 build.config.msm.monaco
+build.config.msm.kona
diff --git a/modules.list.msm.kona b/modules.list.msm.kona
new file mode 100644
index 000000000000..c74e8e1eb2b4
--- /dev/null
+++ b/modules.list.msm.kona
@@ -0,0 +1,24 @@
+dcc_v2.ko
+llcc-qcom.ko
+memory_dump_v2.ko
+minidump.ko
+qcom_wdt_core.ko
+qcom_soc_wdt.ko
+socinfo.ko
+mdt_loader.ko
+qcom-scm.ko
+smem.ko
+secure_buffer.ko
+qcom-cpufreq-hw.ko
+sched-walt.ko
+qti-regmap-debugfs.ko
+qcom_hwspinlock.ko
+qcom-pdc.ko
+mem_buf.ko
+mem_buf_dev.ko
+qcom_dma_heaps.ko
+arm_smmu.ko
+msm_dma_iommu_mapping.ko
+qcom_iommu_util.ko
+iommu-logger.ko
+qcom_ipc_logging.ko
diff --git a/modules.systemdlkm_blocklist.msm.kona b/modules.systemdlkm_blocklist.msm.kona
new file mode 100644
index 000000000000..85698d918b21
--- /dev/null
+++ b/modules.systemdlkm_blocklist.msm.kona
@@ -0,0 +1,3 @@
+# SPDX-License-Identifier: GPL-2.0-only
+# Copyright (c) 2022, Qualcomm Innovation Center, Inc. All rights reserved.
+
diff --git a/modules.vendor_blocklist.msm.kona b/modules.vendor_blocklist.msm.kona
new file mode 100644
index 000000000000..bb3b8ba99a06
--- /dev/null
+++ b/modules.vendor_blocklist.msm.kona
@@ -0,0 +1,66 @@
+# SPDX-License-Identifier: GPL-2.0-only
+# Copyright (c) 2020, The Linux Foundation. All rights reserved.
+# Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
+
+blocklist 8250_of
+blocklist adc-tm
+blocklist atomic64_test
+blocklist can-bcm
+blocklist can-gw
+blocklist can-raw
+blocklist dummy-cpufreq
+blocklist dummy_hcd
+blocklist dummy_hcd
+blocklist e4000
+blocklist failover
+blocklist fc0011
+blocklist fc0012
+blocklist fc0013
+blocklist fc2580
+blocklist it913x
+blocklist kheaders
+blocklist lkdtm
+blocklist llcc_perfmon
+blocklist locktorture
+blocklist m88rs6000t
+blocklist max2165
+blocklist mc44s803
+blocklist mmrm_test_module
+blocklist msi001
+blocklist mt2060
+blocklist mt2063
+blocklist mt20xx
+blocklist mt2131
+blocklist mt2266
+blocklist mxl301rf
+blocklist net_failover
+blocklist qm1d1b0004
+blocklist qm1d1c0042
+blocklist qt1010
+blocklist r820t
+blocklist rcutorture
+blocklist rtc-test
+blocklist si2157
+blocklist tda18212
+blocklist tda18218
+blocklist tda18250
+blocklist tda18271
+blocklist tda827x
+blocklist tda8290
+blocklist tda9887
+blocklist tea5761
+blocklist tea5767
+blocklist test_user_copy
+blocklist torture
+blocklist tua9001
+blocklist tuner-simple
+blocklist tuner-types
+blocklist tuner-xc2028
+blocklist vmw_vsock_virtio_transport
+blocklist vmw_vsock_virtio_transport_common
+blocklist vsock
+blocklist vsock_diag
+blocklist xc4000
+blocklist xc5000
+blocklist limits_stat
+blocklist kunit