[2/5] UBUNTU: [Config] arm64: snapdragon: SND*=m

Message ID 1539186692-28644-3-git-send-email-paolo.pisati@canonical.com
State New
Headers show
Series
  • [1/5] UBUNTU: [Config] arm64: snapdragon: DRM_MSM=m
Related show

Commit Message

Paolo Pisati Oct. 10, 2018, 3:51 p.m.
BugLink: https://bugs.launchpad.net/bugs/1797154

Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
---
 debian.master/config/amd64/config.common.amd64    |  3 ---
 debian.master/config/arm64/config.common.arm64    |  7 +++++++
 debian.master/config/arm64/config.flavour.generic | 15 ---------------
 .../config/arm64/config.flavour.snapdragon        | 15 ---------------
 debian.master/config/armhf/config.common.armhf    |  8 --------
 debian.master/config/config.common.ubuntu         |  8 ++++++++
 debian.master/config/i386/config.common.i386      |  3 ---
 .../config/ppc64el/config.common.ppc64el          |  3 ---
 8 files changed, 15 insertions(+), 47 deletions(-)

Patch

diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
index 0dbf99299ffc..e9beda91e1b3 100644
--- a/debian.master/config/amd64/config.common.amd64
+++ b/debian.master/config/amd64/config.common.amd64
@@ -404,11 +404,8 @@  CONFIG_SND_DMAENGINE_PCM=m
 CONFIG_SND_PCM=m
 CONFIG_SND_SOC=m
 CONFIG_SND_SOC_FSL_SSI=m
-CONFIG_SND_SOC_HDMI_CODEC=m
 CONFIG_SND_SOC_I2C_AND_SPI=m
 CONFIG_SND_SOC_IMX_AUDMUX=m
-CONFIG_SND_SOC_MSM8916_WCD_ANALOG=m
-CONFIG_SND_SOC_MSM8916_WCD_DIGITAL=m
 CONFIG_SND_SOC_SGTL5000=m
 CONFIG_SND_TIMER=m
 CONFIG_SOC_TI=y
diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64
index 8c48fd7b860c..dd16885bebdc 100644
--- a/debian.master/config/arm64/config.common.arm64
+++ b/debian.master/config/arm64/config.common.arm64
@@ -3,6 +3,7 @@ 
 #
 CONFIG_6LOWPAN=m
 CONFIG_ABX500_CORE=y
+CONFIG_AC97_BUS=m
 # CONFIG_ACPI_DEBUG is not set
 # CONFIG_ACPI_DEBUGGER is not set
 CONFIG_ACPI_REDUCED_HARDWARE_ONLY=y
@@ -391,9 +392,15 @@  CONFIG_SGI_IOC4=m
 CONFIG_SGI_PARTITION=y
 CONFIG_SLIP=m
 CONFIG_SMC91X=y
+CONFIG_SND=m
+CONFIG_SND_DMAENGINE_PCM=m
+CONFIG_SND_PCM=m
+CONFIG_SND_SOC=m
 CONFIG_SND_SOC_FSL_SSI=m
+CONFIG_SND_SOC_I2C_AND_SPI=m
 CONFIG_SND_SOC_IMX_AUDMUX=m
 CONFIG_SND_SOC_SGTL5000=m
+CONFIG_SND_TIMER=m
 CONFIG_SOC_BRCMSTB=y
 CONFIG_SOC_TI=y
 CONFIG_SOLARIS_X86_PARTITION=y
diff --git a/debian.master/config/arm64/config.flavour.generic b/debian.master/config/arm64/config.flavour.generic
index df0d22974b1b..0d4102cbae05 100644
--- a/debian.master/config/arm64/config.flavour.generic
+++ b/debian.master/config/arm64/config.flavour.generic
@@ -1,7 +1,6 @@ 
 #
 # Config options for config.flavour.generic automatically generated by splitconfig.pl
 #
-CONFIG_AC97_BUS=m
 # CONFIG_ADV7511_SNAPDRAGON_HACKS is not set
 CONFIG_CEC_CORE=m
 CONFIG_COMMON_CLK_QCOM=m
@@ -48,20 +47,6 @@  CONFIG_REGULATOR_QCOM_SMD_RPM=m
 CONFIG_REGULATOR_QCOM_SPMI=m
 CONFIG_RPMSG=m
 CONFIG_RPMSG_QCOM_SMD=m
-CONFIG_SND=m
-CONFIG_SND_DMAENGINE_PCM=m
-CONFIG_SND_PCM=m
-CONFIG_SND_SOC=m
-CONFIG_SND_SOC_APQ8016_SBC=m
-CONFIG_SND_SOC_HDMI_CODEC=m
-CONFIG_SND_SOC_I2C_AND_SPI=m
-CONFIG_SND_SOC_LPASS_APQ8016=m
-CONFIG_SND_SOC_LPASS_CPU=m
-CONFIG_SND_SOC_LPASS_PLATFORM=m
-CONFIG_SND_SOC_MSM8916_WCD_ANALOG=m
-CONFIG_SND_SOC_MSM8916_WCD_DIGITAL=m
-CONFIG_SND_SOC_QCOM=m
-CONFIG_SND_TIMER=m
 CONFIG_SOUND=m
 CONFIG_SPI_QUP=m
 CONFIG_SPMI=m
diff --git a/debian.master/config/arm64/config.flavour.snapdragon b/debian.master/config/arm64/config.flavour.snapdragon
index b71e3a698e50..f4a2218b27c9 100644
--- a/debian.master/config/arm64/config.flavour.snapdragon
+++ b/debian.master/config/arm64/config.flavour.snapdragon
@@ -1,7 +1,6 @@ 
 #
 # Config options for config.flavour.snapdragon automatically generated by splitconfig.pl
 #
-CONFIG_AC97_BUS=y
 CONFIG_ADV7511_SNAPDRAGON_HACKS=y
 CONFIG_CEC_CORE=y
 CONFIG_COMMON_CLK_QCOM=y
@@ -48,20 +47,6 @@  CONFIG_REGULATOR_QCOM_SMD_RPM=y
 CONFIG_REGULATOR_QCOM_SPMI=y
 CONFIG_RPMSG=y
 CONFIG_RPMSG_QCOM_SMD=y
-CONFIG_SND=y
-CONFIG_SND_DMAENGINE_PCM=y
-CONFIG_SND_PCM=y
-CONFIG_SND_SOC=y
-CONFIG_SND_SOC_APQ8016_SBC=y
-CONFIG_SND_SOC_HDMI_CODEC=y
-CONFIG_SND_SOC_I2C_AND_SPI=y
-CONFIG_SND_SOC_LPASS_APQ8016=y
-CONFIG_SND_SOC_LPASS_CPU=y
-CONFIG_SND_SOC_LPASS_PLATFORM=y
-CONFIG_SND_SOC_MSM8916_WCD_ANALOG=y
-CONFIG_SND_SOC_MSM8916_WCD_DIGITAL=y
-CONFIG_SND_SOC_QCOM=y
-CONFIG_SND_TIMER=y
 CONFIG_SOUND=y
 CONFIG_SPI_QUP=y
 CONFIG_SPMI=y
diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
index ff3ab974f1d7..bb34e1c628d2 100644
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -426,15 +426,7 @@  CONFIG_SND_COMPRESS_OFFLOAD=y
 CONFIG_SND_DMAENGINE_PCM=y
 CONFIG_SND_PCM=y
 CONFIG_SND_SOC=y
-CONFIG_SND_SOC_APQ8016_SBC=m
-CONFIG_SND_SOC_HDMI_CODEC=m
 CONFIG_SND_SOC_I2C_AND_SPI=y
-CONFIG_SND_SOC_LPASS_APQ8016=m
-CONFIG_SND_SOC_LPASS_CPU=m
-CONFIG_SND_SOC_LPASS_PLATFORM=m
-CONFIG_SND_SOC_MSM8916_WCD_ANALOG=m
-CONFIG_SND_SOC_MSM8916_WCD_DIGITAL=m
-CONFIG_SND_SOC_QCOM=m
 CONFIG_SND_TIMER=y
 # CONFIG_SOC_BRCMSTB is not set
 CONFIG_SOC_TI=y
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index c8797ad0b8d0..2ed5752065b1 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -8585,6 +8585,7 @@  CONFIG_SND_SOC_ALC5632=m
 CONFIG_SND_SOC_AMD_ACP=m
 CONFIG_SND_SOC_AMD_CZ_DA7219MX98357_MACH=m
 CONFIG_SND_SOC_AMD_CZ_RT5645_MACH=m
+CONFIG_SND_SOC_APQ8016_SBC=m
 CONFIG_SND_SOC_ARIZONA=m
 CONFIG_SND_SOC_ARNDALE_RT5631_ALC5631=m
 CONFIG_SND_SOC_BD28623=m
@@ -8630,6 +8631,7 @@  CONFIG_SND_SOC_FSL_UTILS=m
 CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
 CONFIG_SND_SOC_GTM601=m
 CONFIG_SND_SOC_HDAC_HDMI=m
+CONFIG_SND_SOC_HDMI_CODEC=m
 CONFIG_SND_SOC_IMG=y
 CONFIG_SND_SOC_IMG_I2S_IN=m
 CONFIG_SND_SOC_IMG_I2S_OUT=m
@@ -8674,7 +8676,10 @@  CONFIG_SND_SOC_INTEL_SST=m
 CONFIG_SND_SOC_INTEL_SST_ACPI=m
 CONFIG_SND_SOC_INTEL_SST_FIRMWARE=m
 CONFIG_SND_SOC_INTEL_SST_TOPLEVEL=y
+CONFIG_SND_SOC_LPASS_APQ8016=m
+CONFIG_SND_SOC_LPASS_CPU=m
 CONFIG_SND_SOC_LPASS_IPQ806X=m
+CONFIG_SND_SOC_LPASS_PLATFORM=m
 CONFIG_SND_SOC_MAX9759=m
 CONFIG_SND_SOC_MAX98090=m
 CONFIG_SND_SOC_MAX98095=m
@@ -8686,6 +8691,8 @@  CONFIG_SND_SOC_MAX9867=m
 CONFIG_SND_SOC_MAX98927=m
 CONFIG_SND_SOC_MC13783=m
 CONFIG_SND_SOC_MEDIATEK=m
+CONFIG_SND_SOC_MSM8916_WCD_ANALOG=m
+CONFIG_SND_SOC_MSM8916_WCD_DIGITAL=m
 CONFIG_SND_SOC_MSM8996=m
 # CONFIG_SND_SOC_MT2701 is not set
 CONFIG_SND_SOC_MT6351=m
@@ -8712,6 +8719,7 @@  CONFIG_SND_SOC_PCM3168A_SPI=m
 CONFIG_SND_SOC_PCM512x=m
 CONFIG_SND_SOC_PCM512x_I2C=m
 CONFIG_SND_SOC_PCM512x_SPI=m
+CONFIG_SND_SOC_QCOM=m
 CONFIG_SND_SOC_QDSP6=m
 CONFIG_SND_SOC_QDSP6_ADM=m
 CONFIG_SND_SOC_QDSP6_AFE=m
diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
index c81f4ec339f5..ef5247f98023 100644
--- a/debian.master/config/i386/config.common.i386
+++ b/debian.master/config/i386/config.common.i386
@@ -396,11 +396,8 @@  CONFIG_SND_DMAENGINE_PCM=m
 CONFIG_SND_PCM=m
 CONFIG_SND_SOC=m
 CONFIG_SND_SOC_FSL_SSI=m
-CONFIG_SND_SOC_HDMI_CODEC=m
 CONFIG_SND_SOC_I2C_AND_SPI=m
 CONFIG_SND_SOC_IMX_AUDMUX=m
-CONFIG_SND_SOC_MSM8916_WCD_ANALOG=m
-CONFIG_SND_SOC_MSM8916_WCD_DIGITAL=m
 CONFIG_SND_SOC_SGTL5000=m
 CONFIG_SND_TIMER=m
 CONFIG_SOC_TI=y
diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el
index 99887f71a11a..4eae101b324b 100644
--- a/debian.master/config/ppc64el/config.common.ppc64el
+++ b/debian.master/config/ppc64el/config.common.ppc64el
@@ -402,11 +402,8 @@  CONFIG_SND_DMAENGINE_PCM=m
 CONFIG_SND_PCM=m
 CONFIG_SND_SOC=m
 CONFIG_SND_SOC_FSL_SSI=m
-CONFIG_SND_SOC_HDMI_CODEC=m
 CONFIG_SND_SOC_I2C_AND_SPI=m
 CONFIG_SND_SOC_IMX_AUDMUX=m
-CONFIG_SND_SOC_MSM8916_WCD_ANALOG=m
-CONFIG_SND_SOC_MSM8916_WCD_DIGITAL=m
 CONFIG_SND_SOC_SGTL5000=m
 CONFIG_SND_TIMER=m
 CONFIG_SOC_TI=y