summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan-Simon Moeller <jsmoeller@linuxfoundation.org>2020-10-15 23:41:13 +0200
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2020-10-19 10:28:15 +0000
commitd5a2cea5084f4af88012aca2a8a548e730ec1989 (patch)
tree1ed909360b06f96e5507a6f39178aac1ae3db2a8
parent07233e358d675e1ef18152ee3532cf2f64466991 (diff)
Only include hda sound modules for qemuall
Limit the HDA sound module inclusion to all qemu targets. Bug-AGL: SPEC-3612 Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org> Change-Id: Iba3a7387c58f1738c1cd98df1d13584c2fff17b7 Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/25443
-rw-r--r--meta-agl-bsp/recipes-kernel/linux/linux-agl.inc4
-rw-r--r--meta-agl-bsp/recipes-kernel/linux/linux/sound-hda.cfg17
-rw-r--r--meta-agl-bsp/recipes-kernel/linux/linux/sound.cfg18
3 files changed, 21 insertions, 18 deletions
diff --git a/meta-agl-bsp/recipes-kernel/linux/linux-agl.inc b/meta-agl-bsp/recipes-kernel/linux/linux-agl.inc
index c667b9c..cd960ef 100644
--- a/meta-agl-bsp/recipes-kernel/linux/linux-agl.inc
+++ b/meta-agl-bsp/recipes-kernel/linux/linux-agl.inc
@@ -111,6 +111,10 @@ KERNEL_CONFIG_FRAGMENTS_append_with-lsm-smack = "\
SRC_URI_append = " file://sound.cfg"
KERNEL_CONFIG_FRAGMENTS_append = " ${WORKDIR}/sound.cfg"
+# add hda audio for qemu
+SRC_URI_append_qemuall = " file://sound-hda.cfg"
+KERNEL_CONFIG_FRAGMENTS_append_qemuall = " ${WORKDIR}/sound-hda.cfg"
+
# iio-dummy-device support for test iiodevice
SRC_URI_append = " file://iiodevice.cfg"
KERNEL_CONFIG_FRAGMENTS_append = " ${WORKDIR}/iiodevice.cfg"
diff --git a/meta-agl-bsp/recipes-kernel/linux/linux/sound-hda.cfg b/meta-agl-bsp/recipes-kernel/linux/linux/sound-hda.cfg
new file mode 100644
index 0000000..01e5090
--- /dev/null
+++ b/meta-agl-bsp/recipes-kernel/linux/linux/sound-hda.cfg
@@ -0,0 +1,17 @@
+# make sure HDA sound modules are on
+# this is required for CI tests
+CONFIG_SND_HDA_INTEL=m
+CONFIG_SND_HDA_GENERIC=m
+CONFIG_SND_HDA_CODEC_REALTEK=m
+CONFIG_SND_HDA_CODEC_ANALOG=m
+CONFIG_SND_HDA_CODEC_SIGMATEL=m
+CONFIG_SND_HDA_CODEC_VIA=m
+CONFIG_SND_HDA_CODEC_HDMI=m
+CONFIG_SND_HDA_CODEC_CIRRUS=m
+CONFIG_SND_HDA_CODEC_CONEXANT=m
+CONFIG_SND_HDA_CODEC_CA0110=m
+CONFIG_SND_HDA_CODEC_CA0132=m
+CONFIG_SND_HDA_CODEC_CMEDIA=m
+CONFIG_SND_HDA_CODEC_SI3054=m
+CONFIG_SND_HDA_RECONFIG=y
+CONFIG_SND_HDA_PATCH_LOADER=y
diff --git a/meta-agl-bsp/recipes-kernel/linux/linux/sound.cfg b/meta-agl-bsp/recipes-kernel/linux/linux/sound.cfg
index 3d82691..ad34ea6 100644
--- a/meta-agl-bsp/recipes-kernel/linux/linux/sound.cfg
+++ b/meta-agl-bsp/recipes-kernel/linux/linux/sound.cfg
@@ -5,21 +5,3 @@ CONFIG_SND_PCM=y
CONFIG_SND_DYNAMIC_MINORS=y
CONFIG_SND_MAX_CARDS=32
CONFIG_SND_ALOOP=m
-
-# make sure HDA sound modules are on
-# this is required for CI tests
-CONFIG_SND_HDA_INTEL=m
-CONFIG_SND_HDA_GENERIC=m
-CONFIG_SND_HDA_CODEC_REALTEK=m
-CONFIG_SND_HDA_CODEC_ANALOG=m
-CONFIG_SND_HDA_CODEC_SIGMATEL=m
-CONFIG_SND_HDA_CODEC_VIA=m
-CONFIG_SND_HDA_CODEC_HDMI=m
-CONFIG_SND_HDA_CODEC_CIRRUS=m
-CONFIG_SND_HDA_CODEC_CONEXANT=m
-CONFIG_SND_HDA_CODEC_CA0110=m
-CONFIG_SND_HDA_CODEC_CA0132=m
-CONFIG_SND_HDA_CODEC_CMEDIA=m
-CONFIG_SND_HDA_CODEC_SI3054=m
-CONFIG_SND_HDA_RECONFIG=y
-CONFIG_SND_HDA_PATCH_LOADER=y