aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Murray <scott.murray@konsulko.com>2019-06-27 10:10:46 -0400
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2019-06-27 21:00:59 +0000
commit19bb8c74dd58851d27afbc34a9c656dc5b852a46 (patch)
tree54e255a2ea13b8f4e9006e7a4b90120dc22dff8d
parent220048d7b81c4eb89d3bc288980e161ea309e1e4 (diff)
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 <scott.murray@konsulko.com>
-rw-r--r--meta-agl-bsp/recipes-kernel/linux/linux-agl.inc6
-rw-r--r--meta-agl-bsp/recipes-kernel/linux/linux/sound.cfg (renamed from meta-agl-bsp/recipes-kernel/linux/linux/4a-sound.cfg)2
2 files changed, 4 insertions, 4 deletions
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/sound.cfg
index 1a2010428..ad34ea680 100644
--- a/meta-agl-bsp/recipes-kernel/linux/linux/4a-sound.cfg
+++ b/meta-agl-bsp/recipes-kernel/linux/linux/sound.cfg
@@ -2,6 +2,6 @@ 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
+CONFIG_SND_ALOOP=m