From 19bb8c74dd58851d27afbc34a9c656dc5b852a46 Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Thu, 27 Jun 2019 10:10:46 -0400 Subject: linux-agl: change aloop to a module instead of built-in Rename the 4a-sound.cfg fragment to the more generic sound.cfg, and change CONFIG_SND_ALOOP to module, not built-in. This still keeps it available if something ends up needing it. Bug-AGL: SPEC-2555 Change-Id: Ib0554800dc704d19b48a7e041d4f2b60a1b42192 Signed-off-by: Scott Murray --- meta-agl-bsp/recipes-kernel/linux/linux-agl.inc | 6 +++--- meta-agl-bsp/recipes-kernel/linux/linux/4a-sound.cfg | 7 ------- meta-agl-bsp/recipes-kernel/linux/linux/sound.cfg | 7 +++++++ 3 files changed, 10 insertions(+), 10 deletions(-) delete mode 100644 meta-agl-bsp/recipes-kernel/linux/linux/4a-sound.cfg create mode 100644 meta-agl-bsp/recipes-kernel/linux/linux/sound.cfg diff --git a/meta-agl-bsp/recipes-kernel/linux/linux-agl.inc b/meta-agl-bsp/recipes-kernel/linux/linux-agl.inc index 72b8b8085..e8be23c7c 100644 --- a/meta-agl-bsp/recipes-kernel/linux/linux-agl.inc +++ b/meta-agl-bsp/recipes-kernel/linux/linux-agl.inc @@ -80,9 +80,9 @@ KERNEL_CONFIG_FRAGMENTS_append_with-lsm-smack = "\ ${WORKDIR}/smack-default-lsm.cfg \ " -# snd-aloop support for 4a -SRC_URI_append = " file://4a-sound.cfg" -KERNEL_CONFIG_FRAGMENTS_append = " ${WORKDIR}/4a-sound.cfg" +# ALSA support and other sound related configuration +SRC_URI_append = " file://sound.cfg" +KERNEL_CONFIG_FRAGMENTS_append = " ${WORKDIR}/sound.cfg" # iio-dummy-device support for test iiodevice SRC_URI_append = " file://iiodevice.cfg" diff --git a/meta-agl-bsp/recipes-kernel/linux/linux/4a-sound.cfg b/meta-agl-bsp/recipes-kernel/linux/linux/4a-sound.cfg deleted file mode 100644 index 1a2010428..000000000 --- a/meta-agl-bsp/recipes-kernel/linux/linux/4a-sound.cfg +++ /dev/null @@ -1,7 +0,0 @@ -CONFIG_SOUND=y -CONFIG_SND=y -CONFIG_SND_TIMER=y -CONFIG_SND_PCM=y -CONFIG_SND_ALOOP=y -CONFIG_SND_DYNAMIC_MINORS=y -CONFIG_SND_MAX_CARDS=32 diff --git a/meta-agl-bsp/recipes-kernel/linux/linux/sound.cfg b/meta-agl-bsp/recipes-kernel/linux/linux/sound.cfg new file mode 100644 index 000000000..ad34ea680 --- /dev/null +++ b/meta-agl-bsp/recipes-kernel/linux/linux/sound.cfg @@ -0,0 +1,7 @@ +CONFIG_SOUND=y +CONFIG_SND=y +CONFIG_SND_TIMER=y +CONFIG_SND_PCM=y +CONFIG_SND_DYNAMIC_MINORS=y +CONFIG_SND_MAX_CARDS=32 +CONFIG_SND_ALOOP=m -- cgit 1.2.3-korg