diff --git a/config/gvmauto.conf b/config/gvmauto.conf
index 1cdc7b30eddb..36eb6be8a26f 100644
--- a/config/gvmauto.conf
+++ b/config/gvmauto.conf
@@ -11,9 +11,6 @@ export CONFIG_SND_SOC_MSM_QDSP6V2_VM=m
 export CONFIG_SND_SOC_QDSP6V2=m
 export CONFIG_QTI_PP=m
 export CONFIG_SND_HWDEP_ROUTING=m
-export CONFIG_DTS_EAGLE=m
-export CONFIG_DOLBY_DS2=m
-export CONFIG_DOLBY_LICENSE=m
 export CONFIG_SND_SOC_MSM_STUB=m
 export CONFIG_SND_SOC_MSM_HDMI_CODEC_RX=m
 export CONFIG_MSM_QDSP6V2_CODECS=m
diff --git a/config/gvmautoconf.h b/config/gvmautoconf.h
index fb47aecd21cb..6e28cae199ca 100644
--- a/config/gvmautoconf.h
+++ b/config/gvmautoconf.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2018-2019, 2021 The Linux Foundation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 and
@@ -19,9 +19,6 @@
 #define CONFIG_SND_SOC_QDSP6V2 1
 #define CONFIG_QTI_PP 1
 #define CONFIG_SND_HWDEP_ROUTING 1
-#define CONFIG_DTS_EAGLE 1
-#define CONFIG_DOLBY_DS2 1
-#define CONFIG_DOLBY_LICENSE 1
 #define CONFIG_SND_SOC_MSM_STUB 1
 #define CONFIG_SND_SOC_MSM_HDMI_CODEC_RX 1
 #define CONFIG_MSM_QDSP6V2_CODECS 1
diff --git a/config/sa6155auto.conf b/config/sa6155auto.conf
index 8ffbf3a70c09..70c8f3c7e777 100644
--- a/config/sa6155auto.conf
+++ b/config/sa6155auto.conf
@@ -5,9 +5,6 @@ export CONFIG_MSM_QDSP6_NOTIFIER=m
 export CONFIG_SND_SOC_MSM_QDSP6V2_INTF=m
 export CONFIG_QTI_PP=m
 export CONFIG_SND_HWDEP_ROUTING=m
-export CONFIG_DTS_EAGLE=m
-export CONFIG_DOLBY_DS2=m
-export CONFIG_DOLBY_LICENSE=m
 export CONFIG_SND_SOC_MSM_STUB=m
 export CONFIG_SND_SOC_MSM_HDMI_CODEC_RX=m
 export CONFIG_MSM_QDSP6V2_CODECS=m
diff --git a/config/sa6155autoconf.h b/config/sa6155autoconf.h
index 67799e17fdc7..26730c6064c9 100644
--- a/config/sa6155autoconf.h
+++ b/config/sa6155autoconf.h
@@ -17,9 +17,6 @@
 #define CONFIG_SND_SOC_MSM_QDSP6V2_INTF 1
 #define CONFIG_QTI_PP 1
 #define CONFIG_SND_HWDEP_ROUTING 1
-#define CONFIG_DTS_EAGLE 1
-#define CONFIG_DOLBY_DS2 1
-#define CONFIG_DOLBY_LICENSE 1
 #define CONFIG_SND_SOC_MSM_STUB 1
 #define CONFIG_SND_SOC_MSM_HDMI_CODEC_RX 1
 #define CONFIG_MSM_QDSP6V2_CODECS 1
diff --git a/config/sa8155auto.conf b/config/sa8155auto.conf
index fc7057eb6c64..f11ce881c3b2 100644
--- a/config/sa8155auto.conf
+++ b/config/sa8155auto.conf
@@ -6,9 +6,6 @@ export CONFIG_SND_SOC_MSM_QDSP6V2_INTF=m
 export CONFIG_SND_SOC_QDSP6V2=m
 export CONFIG_QTI_PP=m
 export CONFIG_SND_HWDEP_ROUTING=m
-export CONFIG_DTS_EAGLE=m
-export CONFIG_DOLBY_DS2=m
-export CONFIG_DOLBY_LICENSE=m
 export CONFIG_SND_SOC_MSM_STUB=m
 export CONFIG_SND_SOC_MSM_HDMI_CODEC_RX=m
 export CONFIG_MSM_QDSP6V2_CODECS=m
diff --git a/config/sa8155autoconf.h b/config/sa8155autoconf.h
index 7470fc6b5cd2..8557d8bd8644 100644
--- a/config/sa8155autoconf.h
+++ b/config/sa8155autoconf.h
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
-/* Copyright (c) 2019, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2019, 2021 The Linux Foundation. All rights reserved.
  */
 
 #define CONFIG_MSM_QDSP6_APRV2_RPMSG 1
@@ -10,9 +10,6 @@
 #define CONFIG_SND_SOC_QDSP6V2 1
 #define CONFIG_QTI_PP 1
 #define CONFIG_SND_HWDEP_ROUTING 1
-#define CONFIG_DTS_EAGLE 1
-#define CONFIG_DOLBY_DS2 1
-#define CONFIG_DOLBY_LICENSE 1
 #define CONFIG_SND_SOC_MSM_STUB 1
 #define CONFIG_SND_SOC_MSM_HDMI_CODEC_RX 1
 #define CONFIG_MSM_QDSP6V2_CODECS 1