diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index 7457f0e57125..f7fb19b172ba 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -1456,3 +1456,4 @@ endif
 
 source "lib/Kconfig"
 source "coretech/Kconfig"
+source "techpack/Kconfig"
diff --git a/techpack/Kconfig b/techpack/Kconfig
new file mode 100644
index 000000000000..34343a10682d
--- /dev/null
+++ b/techpack/Kconfig
@@ -0,0 +1 @@
+source techpack/audio/Kconfig
diff --git a/techpack/audio/Kconfig b/techpack/audio/Kconfig
new file mode 100644
index 000000000000..d29e0ddff03d
--- /dev/null
+++ b/techpack/audio/Kconfig
@@ -0,0 +1,152 @@
+config AFE_HWDEP
+	tristate "AFE_HWDEP"
+config AUDIO_EXT_CLK
+	tristate "AUDIO_EXT_CLK"
+config DOLBY_DS2
+	tristate "DOLBY_DS2"
+config DOLBY_LICENSE
+	tristate "DOLBY_LICENSE"
+config DTS_EAGLE
+	tristate "DTS_EAGLE"
+config DTS_SRS_TM
+	tristate "DTS_SRS_TM"
+config MSM_ADSP_LOADER
+	tristate "MSM_ADSP_LOADER"
+config MSM_AVTIMER
+	tristate "MSM_AVTIMER"
+config MSM_CDC_PINCTRL
+	tristate "MSM_CDC_PINCTRL"
+config MSM_GLINK_SPI_XPRT
+	tristate "MSM_GLINK_SPI_XPRT"
+config MSM_MDF
+	tristate "MSM_MDF"
+config MSM_QDSP6_APRV2_GLINK
+	tristate "MSM_QDSP6_APRV2_GLINK"
+config MSM_QDSP6_APRV2_RPMSG
+	tristate "MSM_QDSP6_APRV2_RPMSG"
+config MSM_QDSP6_APRV3_GLINK
+	tristate "MSM_QDSP6_APRV3_GLINK"
+config MSM_QDSP6_NOTIFIER
+	tristate "MSM_QDSP6_NOTIFIER"
+config MSM_QDSP6_PDR
+	tristate "MSM_QDSP6_PDR"
+config MSM_QDSP6_SSR
+	tristate "MSM_QDSP6_SSR"
+config MSM_QDSP6V2_CODECS
+	tristate "MSM_QDSP6V2_CODECS"
+config MSM_ULTRASOUND
+	tristate "MSM_ULTRASOUND"
+config PINCTRL_LPI
+	tristate "PINCTRL_LPI"
+config PINCTRL_WCD
+	tristate "PINCTRL_WCD"
+config QTI_PP
+	tristate "QTI_PP"
+config REGMAP_SWR
+	tristate "REGMAP_SWR"
+config RX_MACRO
+	tristate "RX_MACRO"
+config SND_EVENT
+	tristate "SND_EVENT"
+config SND_HWDEP_ROUTING
+	tristate "SND_HWDEP_ROUTING"
+config SND_SOC_ANALOG_CDC
+	tristate "SND_SOC_ANALOG_CDC"
+config SND_SOC_BOLERO
+	tristate "SND_SOC_BOLERO"
+config SND_SOC_CPE
+	tristate "SND_SOC_CPE"
+config SND_SOC_CSRA66X0
+	tristate "SND_SOC_CSRA66X0"
+config SND_SOC_DIGITAL_CDC
+	tristate "SND_SOC_DIGITAL_CDC"
+config SND_SOC_EP92
+	tristate "SND_SOC_EP92"
+config SND_SOC_EXT_CODEC
+	tristate "SND_SOC_EXT_CODEC"
+config SND_SOC_INT_CODEC
+	tristate "SND_SOC_INT_CODEC"
+config SND_SOC_MACHINE_SDXPOORWILLS
+	tristate "SND_SOC_MACHINE_SDXPOORWILLS"
+config SND_SOC_MSM_HDMI_CODEC_RX
+	tristate "SND_SOC_MSM_HDMI_CODEC_RX"
+config SND_SOC_MSM_HOSTLESS_PCM
+	tristate "SND_SOC_MSM_HOSTLESS_PCM"
+config SND_SOC_MSM_QDSP6V2_INTF
+	tristate "SND_SOC_MSM_QDSP6V2_INTF"
+config SND_SOC_MSM_SDW
+	tristate "SND_SOC_MSM_SDW"
+config SND_SOC_MSM_STUB
+	tristate "SND_SOC_MSM_STUB"
+config SND_SOC_POORWILLS
+	tristate "SND_SOC_POORWILLS"
+config SND_SOC_QCS405
+	tristate "SND_SOC_QCS405"
+config SND_SOC_QDSP6V2
+	tristate "SND_SOC_QDSP6V2"
+config SND_SOC_SDM660_CDC
+	tristate "SND_SOC_SDM660_CDC"
+config SND_SOC_SDM670
+	tristate "SND_SOC_SDM670"
+config SND_SOC_SDM845
+	tristate "SND_SOC_SDM845"
+config SND_SOC_SM6150
+	tristate "SND_SOC_SM6150"
+config SND_SOC_SM8150
+	tristate "SND_SOC_SM8150"
+config SND_SOC_TFA9874_FOR_DAVI
+	tristate "SND_SOC_TFA9874_FOR_DAVI"
+config SND_SOC_TFA9874_OR_HAPTIC
+	tristate "SND_SOC_TFA9874_OR_HAPTIC"
+config SND_SOC_TFA9894
+	tristate "SND_SOC_TFA9894"
+config SND_SOC_WCD9335
+	tristate "SND_SOC_WCD9335"
+config SND_SOC_WCD934X
+	tristate "SND_SOC_WCD934X"
+config SND_SOC_WCD934X_DSD
+	tristate "SND_SOC_WCD934X_DSD"
+config SND_SOC_WCD934X_MBHC
+	tristate "SND_SOC_WCD934X_MBHC"
+config SND_SOC_WCD9360
+	tristate "SND_SOC_WCD9360"
+config SND_SOC_WCD937X
+	tristate "SND_SOC_WCD937X"
+config SND_SOC_WCD937X_SLAVE
+	tristate "SND_SOC_WCD937X_SLAVE"
+config SND_SOC_WCD9XXX_V2
+	tristate "SND_SOC_WCD9XXX_V2"
+config SND_SOC_WCD_CPE
+	tristate "SND_SOC_WCD_CPE"
+config SND_SOC_WCD_DSP_MGR
+	tristate "SND_SOC_WCD_DSP_MGR"
+config SND_SOC_WCD_IRQ
+	tristate "SND_SOC_WCD_IRQ"
+config SND_SOC_WCD_MBHC
+	tristate "SND_SOC_WCD_MBHC"
+config SND_SOC_WCD_MBHC_ADC
+	tristate "SND_SOC_WCD_MBHC_ADC"
+config SND_SOC_WCD_MBHC_LEGACY
+	tristate "SND_SOC_WCD_MBHC_LEGACY"
+config SND_SOC_WCD_SPI
+	tristate "SND_SOC_WCD_SPI"
+config SND_SOC_WSA881X
+	tristate "SND_SOC_WSA881X"
+config SOUNDWIRE
+	tristate "SOUNDWIRE"
+config SOUNDWIRE_MSTR_CTRL
+	tristate "SOUNDWIRE_MSTR_CTRL"
+config SOUNDWIRE_WCD_CTRL
+	tristate "SOUNDWIRE_WCD_CTRL"
+config TX_MACRO
+	tristate "TX_MACRO"
+config USE_Q6_32CH_SUPPORT
+	tristate "USE_Q6_32CH_SUPPORT"
+config VA_MACRO
+	tristate "VA_MACRO"
+config WCD9XXX_CODEC_CORE
+	tristate "WCD9XXX_CODEC_CORE"
+config WCD_DSP_GLINK
+	tristate "WCD_DSP_GLINK"
+config WSA_MACRO
+	tristate "WSA_MACRO"
diff --git a/techpack/audio/Makefile b/techpack/audio/Makefile
index 9829136de4f7..10005ff8748c 100755
--- a/techpack/audio/Makefile
+++ b/techpack/audio/Makefile
@@ -1,25 +1,3 @@
-# auto-detect subdirs
-ifeq ($(CONFIG_ARCH_SDM845), y)
-include $(srctree)/techpack/audio/config/sdm845auto.conf
-export
-endif
-ifeq ($(CONFIG_ARCH_SDM670), y)
-include $(srctree)/techpack/audio/config/sdm670auto_static.conf
-export
-endif
-ifeq ($(CONFIG_ARCH_SDXPOORWILLS), y)
-include $(srctree)/techpack/audio/config/sdxpoorwillsauto.conf
-export
-endif
-ifeq ($(CONFIG_ARCH_SM8150), y)
-include $(srctree)/techpack/audio/config/sm8150auto.conf
-export
-endif
-ifeq ($(CONFIG_ARCH_SDMSHRIKE), y)
-include $(srctree)/techpack/audio/config/sm8150auto.conf
-export
-endif
-
 # Use USERINCLUDE when you must reference the UAPI directories only.
 USERINCLUDE     += \
                 -I$(srctree)/techpack/audio/include/uapi \
@@ -31,31 +9,9 @@ LINUXINCLUDE    += \
                 -I$(srctree)/techpack/audio/include/elliptic \
                 -I$(srctree)/techpack/audio/include
 
-ifeq ($(CONFIG_ARCH_SDM845), y)
-LINUXINCLUDE    += \
-                -include $(srctree)/techpack/audio/config/sdm845autoconf.h
-endif
-ifeq ($(CONFIG_ARCH_SDM670), y)
-LINUXINCLUDE    += \
-                -include $(srctree)/techpack/audio/config/sdm670autoconf.h
-endif
-ifeq ($(CONFIG_ARCH_SDXPOORWILLS), y)
-LINUXINCLUDE    += \
-                -include $(srctree)/techpack/audio/config/sdxpoorwillsautoconf.h
-endif
-ifeq ($(CONFIG_ARCH_SM8150), y)
-LINUXINCLUDE    += \
-                -include $(srctree)/techpack/audio/config/sm8150autoconf.h
-endif
-ifeq ($(CONFIG_ARCH_SDMSHRIKE), y)
-LINUXINCLUDE    += \
-                -include $(srctree)/techpack/audio/config/sm8150autoconf.h
-endif
-
 LINUXINCLUDE    += \
                 -I$(srctree)/techpack/audio/include/elliptic
 obj-y += dsp/elliptic
-
 obj-y += soc/
 obj-y += dsp/
 obj-y += ipc/