aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--conf/layer.conf2
-rw-r--r--conf/machine/dragonboard-820c.conf1
-rw-r--r--recipes-bsp/firmware/firmware-qcom-dragonboard410c.inc36
-rw-r--r--recipes-bsp/firmware/firmware-qcom-dragonboard410c_1034.2.1.bb37
-rw-r--r--recipes-bsp/firmware/firmware-qcom-dragonboard410c_1036.1.bb15
-rw-r--r--recipes-bsp/firmware/firmware-qcom-dragonboard820c_01700.1.bb4
-rw-r--r--recipes-bsp/firmware/firmware-qcom-dragonboard845c_20190529180356-v4.bb4
-rw-r--r--recipes-bsp/firmware/firmware-qcom-rb5_20210331-v4.bb2
-rw-r--r--recipes-bsp/firmware/firmware-qcom-sd-600eval_1.0.bb2
-rw-r--r--recipes-bsp/lt9611uxc-upgrade/lt9611uxc-upgrade/lt9611uxc-upgrade.sh2
-rw-r--r--recipes-graphics/mesa/files/0001-meson-misdetects-64bit-atomics-on-mips-clang.patch2
-rw-r--r--recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch14
-rw-r--r--recipes-graphics/mesa/files/0002-meson.build-make-TLS-ELF-optional.patch16
-rw-r--r--recipes-graphics/mesa/files/0003-Allow-enable-DRI-without-DRI-drivers.patch12
-rw-r--r--recipes-graphics/mesa/files/0004-Revert-mesa-Enable-asm-unconditionally-now-that-gen_.patch26
-rw-r--r--recipes-graphics/mesa/mesa_git.bb8
-rw-r--r--recipes-multimedia/alsa/alsa-ucm-conf/0001-ucm2-Separate-the-configuration-lookups-hw-based-fro.patch86
-rw-r--r--recipes-multimedia/alsa/alsa-ucm-conf/0001-ucm2-codecs-lpass-add-codec-sequences-for-wsa-and-va.patch75
-rw-r--r--recipes-multimedia/alsa/alsa-ucm-conf/0001-ucm2-conf.d-add-symlinks-for-Qualcomm-cards.patch44
-rw-r--r--recipes-multimedia/alsa/alsa-ucm-conf/0002-ucm2-add-support-to-for-Qualcomm-RB5-Platform.patch130
-rw-r--r--recipes-multimedia/alsa/alsa-ucm-conf_%.bbappend8
-rw-r--r--recipes-support/fastrpc/fastrpc/mount-dsp.sh13
-rw-r--r--recipes-support/fastrpc/fastrpc_git.bb2
23 files changed, 111 insertions, 430 deletions
diff --git a/conf/layer.conf b/conf/layer.conf
index ae7ef91..97bf71b 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -8,6 +8,8 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
BBFILE_COLLECTIONS += "qcom"
BBFILE_PATTERN_qcom := "^${LAYERDIR}/"
BBFILE_PRIORITY_qcom = "5"
+
+LAYERDEPENDS_qcom = "core"
LAYERSERIES_COMPAT_qcom = "zeus dunfell gatesgarth hardknott"
BBFILES_DYNAMIC += " \
diff --git a/conf/machine/dragonboard-820c.conf b/conf/machine/dragonboard-820c.conf
index ed61911..b36d148 100644
--- a/conf/machine/dragonboard-820c.conf
+++ b/conf/machine/dragonboard-820c.conf
@@ -16,6 +16,7 @@ MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += " \
kernel-modules \
${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'linux-firmware-qcom-adreno-a530 mesa-driver-msm', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'linux-firmware-ath10k', '', d)} \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'linux-firmware-qca', '', d)} \
linux-firmware-qcom-venus-4.2 \
"
diff --git a/recipes-bsp/firmware/firmware-qcom-dragonboard410c.inc b/recipes-bsp/firmware/firmware-qcom-dragonboard410c.inc
new file mode 100644
index 0000000..d8361f3
--- /dev/null
+++ b/recipes-bsp/firmware/firmware-qcom-dragonboard410c.inc
@@ -0,0 +1,36 @@
+DESCRIPTION = "QCOM Firmware for DragonBoard 410c"
+
+LICENSE = "Proprietary"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=4d087ee0965cb059f1b2f9429e166f64"
+
+DEPENDS += "mtools-native"
+
+inherit allarch
+
+S = "${WORKDIR}/linux-board-support-package-r${PV}"
+
+do_compile() {
+ :
+}
+
+do_install() {
+ install -d ${D}${nonarch_base_libdir}/firmware/
+
+ install -d ${D}/boot
+ cp ./efs-seed/fs_image_linux.tar.gz.mbn.img ${D}/boot/modem_fsg
+
+ cp -r ./proprietary-linux/wlan ${D}${nonarch_base_libdir}/firmware/
+
+ install -d ${D}${nonarch_base_libdir}/firmware/qcom/msm8916
+ MTOOLS_SKIP_CHECK=1 mcopy -i ./bootloaders-linux/NON-HLOS.bin \
+ ::image/modem.* ::image/mba.mbn ::image/wcnss.* ${D}${nonarch_base_libdir}/firmware/qcom/msm8916
+
+ install -d ${D}${sysconfdir}/
+ install -m 0644 LICENSE ${D}${sysconfdir}/QCOM-LINUX-BOARD-SUPPORT-LICENSE-${PN}
+}
+
+FILES_${PN} += "/boot/modem_fsg"
+FILES_${PN} += "${nonarch_base_libdir}/firmware/wlan/*"
+FILES_${PN} += "${nonarch_base_libdir}/firmware/qcom/msm8916/*"
+
+INSANE_SKIP_${PN} += "arch"
diff --git a/recipes-bsp/firmware/firmware-qcom-dragonboard410c_1034.2.1.bb b/recipes-bsp/firmware/firmware-qcom-dragonboard410c_1034.2.1.bb
index 7ea3a7d..6f188bc 100644
--- a/recipes-bsp/firmware/firmware-qcom-dragonboard410c_1034.2.1.bb
+++ b/recipes-bsp/firmware/firmware-qcom-dragonboard410c_1034.2.1.bb
@@ -1,40 +1,5 @@
-DESCRIPTION = "QCOM Firmware for DragonBoard 410c"
-
-LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=4d087ee0965cb059f1b2f9429e166f64"
+require recipes-bsp/firmware/firmware-qcom-dragonboard410c.inc
SRC_URI = "http://releases.linaro.org/96boards/dragonboard410c/qualcomm/firmware/linux-board-support-package-r${PV}.zip"
SRC_URI[md5sum] = "25c241bfd5fb2e55e8185752d5fe92ce"
SRC_URI[sha256sum] = "46953b974c5c58c7ca66db414437c0268b033ac9d28127e98d9c4e1a49359da5"
-
-DEPENDS += "mtools-native"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-S = "${WORKDIR}/linux-board-support-package-r${PV}"
-
-do_compile() {
- :
-}
-
-do_install() {
- install -d ${D}${nonarch_base_libdir}/firmware/
-
- install -d ${D}/boot
- cp ./efs-seed/fs_image_linux.tar.gz.mbn.img ${D}/boot/modem_fsg
-
- cp -r ./proprietary-linux/wlan ${D}${nonarch_base_libdir}/firmware/
-
- install -d ${D}${nonarch_base_libdir}/firmware/qcom/msm8916
- MTOOLS_SKIP_CHECK=1 mcopy -i ./bootloaders-linux/NON-HLOS.bin \
- ::image/modem.* ::image/mba.mbn ::image/wcnss.* ${D}${nonarch_base_libdir}/firmware/qcom/msm8916
-
- install -d ${D}${sysconfdir}/
- install -m 0644 LICENSE ${D}${sysconfdir}/QCOM-LINUX-BOARD-SUPPORT-LICENSE-${PN}
-}
-
-FILES_${PN} += "/boot/modem_fsg"
-FILES_${PN} += "${nonarch_base_libdir}/firmware/wlan/*"
-FILES_${PN} += "${nonarch_base_libdir}/firmware/qcom/msm8916/*"
-
-INSANE_SKIP_${PN} += "arch"
diff --git a/recipes-bsp/firmware/firmware-qcom-dragonboard410c_1036.1.bb b/recipes-bsp/firmware/firmware-qcom-dragonboard410c_1036.1.bb
new file mode 100644
index 0000000..194c3e5
--- /dev/null
+++ b/recipes-bsp/firmware/firmware-qcom-dragonboard410c_1036.1.bb
@@ -0,0 +1,15 @@
+# This firmware is not released for redistribution, however it can be
+# downloaded from https://developer.qualcomm.com/hardware/dragonboard-410c
+#
+# Add the following line to local.conf to use it:
+# PREFERRED_VERSION_firmware-qcom-dragonboard410c = "1036.1"
+# You have to manually put the downloaded file into ${DL_DIR}
+
+require recipes-bsp/firmware/firmware-qcom-dragonboard410c.inc
+
+SRC_URI = '${@oe.utils.conditional("PREFERRED_VERSION_firmware-qcom-dragonboard410c", "1036.1", "file://dragonboard_410c.zip.1.0-r1036.1.zip", "", d)}'
+SRC_URI[md5sum] = "3092fccf7a97fa319d7732a98425f9d4"
+SRC_URI[sha256sum] = "93070f58fa3aa6467baa881935c37c4da2df2a8af3248746931ce3d11a3a1200"
+
+# This should not be selected by default as the firmware archive is behind the accept&click wall.
+DEFAULT_PREFERENCE = "-1"
diff --git a/recipes-bsp/firmware/firmware-qcom-dragonboard820c_01700.1.bb b/recipes-bsp/firmware/firmware-qcom-dragonboard820c_01700.1.bb
index 494db0d..bb0d9b6 100644
--- a/recipes-bsp/firmware/firmware-qcom-dragonboard820c_01700.1.bb
+++ b/recipes-bsp/firmware/firmware-qcom-dragonboard820c_01700.1.bb
@@ -7,7 +7,7 @@ SRC_URI = "https://releases.linaro.org/96boards/dragonboard820c/qualcomm/firmwar
SRC_URI[md5sum] = "587138c5e677342db9a88d5c8747ec6c"
SRC_URI[sha256sum] = "6ee9c461b2b5dd2d3bd705bb5ea3f44b319ecb909b2772f305ce12439e089cd9"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
+inherit allarch
S = "${WORKDIR}/linux-board-support-package-r${PV}"
@@ -21,6 +21,8 @@ do_install() {
install -m 0444 ./proprietary-linux/adsp*.* ${D}${nonarch_base_libdir}/firmware/qcom/msm8996/
+ install -m 0444 ./bootloaders-linux/adspso.bin ${D}${nonarch_base_libdir}/firmware/qcom/msm8996/
+
install -d ${D}${sysconfdir}/
install -m 0644 LICENSE ${D}${sysconfdir}/QCOM-LINUX-BOARD-SUPPORT-LICENSE-${PN}
}
diff --git a/recipes-bsp/firmware/firmware-qcom-dragonboard845c_20190529180356-v4.bb b/recipes-bsp/firmware/firmware-qcom-dragonboard845c_20190529180356-v4.bb
index dd03753..848b76a 100644
--- a/recipes-bsp/firmware/firmware-qcom-dragonboard845c_20190529180356-v4.bb
+++ b/recipes-bsp/firmware/firmware-qcom-dragonboard845c_20190529180356-v4.bb
@@ -7,7 +7,7 @@ SRC_URI = "https://releases.linaro.org/96boards/dragonboard845c/qualcomm/firmwar
SRC_URI[md5sum] = "ad69855a1275547b16d94a1b5405ac62"
SRC_URI[sha256sum] = "4289d2f2a7124b104d0274879e702aae9b1e50c42eec3747f8584c6744ef65e3"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
+inherit allarch
DEPENDS += "qca-swiss-army-knife-native"
inherit python3native
@@ -21,6 +21,8 @@ do_install() {
install -d ${D}${nonarch_base_libdir}/firmware/
install -d ${D}${nonarch_base_libdir}/firmware/qcom/sdm845
+ install -m 0444 ./08-dspso/dspso.bin ${D}${nonarch_base_libdir}/firmware/qcom/sdm845
+
install -m 0444 ./17-USB3-201-202-FW/K2026090.mem ${D}${nonarch_base_libdir}/firmware/renesas_usb_fw.mem
install -m 0444 ./18-adreno-fw/a630_zap*.* ${D}${nonarch_base_libdir}/firmware/qcom/
install -m 0444 ./20-adsp_split/firmware/adsp*.* ${D}${nonarch_base_libdir}/firmware/qcom/sdm845
diff --git a/recipes-bsp/firmware/firmware-qcom-rb5_20210331-v4.bb b/recipes-bsp/firmware/firmware-qcom-rb5_20210331-v4.bb
index 618a55f..de2679f 100644
--- a/recipes-bsp/firmware/firmware-qcom-rb5_20210331-v4.bb
+++ b/recipes-bsp/firmware/firmware-qcom-rb5_20210331-v4.bb
@@ -22,7 +22,7 @@ PE = "1"
DEPENDS += "qca-swiss-army-knife-native"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
+inherit allarch
VENUS_FW = "vpu-1.0"
diff --git a/recipes-bsp/firmware/firmware-qcom-sd-600eval_1.0.bb b/recipes-bsp/firmware/firmware-qcom-sd-600eval_1.0.bb
index 89e9411..43091ce 100644
--- a/recipes-bsp/firmware/firmware-qcom-sd-600eval_1.0.bb
+++ b/recipes-bsp/firmware/firmware-qcom-sd-600eval_1.0.bb
@@ -7,7 +7,7 @@ SRC_URI = "https://eragon.einfochips.com/pub/media/datasheet/SD_600eval-linux_pr
SRC_URI[md5sum] = "0903e9f656d3cea005ecc8e26f1243b2"
SRC_URI[sha256sum] = "fdffcb2cedc0d0215ee3dec95ce3683a780d9280960d27200379fbe1b21af979"
-PACKAGE_ARCH = "${MACHINE_ARCH}"
+inherit allarch
S = "${WORKDIR}/SD_600eval-linux_proprietary_firmware-v${PV}"
diff --git a/recipes-bsp/lt9611uxc-upgrade/lt9611uxc-upgrade/lt9611uxc-upgrade.sh b/recipes-bsp/lt9611uxc-upgrade/lt9611uxc-upgrade/lt9611uxc-upgrade.sh
index 0886980..9f72525 100644
--- a/recipes-bsp/lt9611uxc-upgrade/lt9611uxc-upgrade/lt9611uxc-upgrade.sh
+++ b/recipes-bsp/lt9611uxc-upgrade/lt9611uxc-upgrade/lt9611uxc-upgrade.sh
@@ -13,7 +13,7 @@ if [ ! -d /sys/bus/i2c/drivers/lt9611uxc ] ; then
fi
for f in /sys/bus/i2c/drivers/lt9611uxc/* ; do
- [ -L $f ] || continue
+ [ -e $f/lt9611uxc_firmware ] || continue
version=`cat $f/lt9611uxc_firmware`
if [ "$version" -lt "43" ] ; then
echo > $f/lt9611uxc_firmware
diff --git a/recipes-graphics/mesa/files/0001-meson-misdetects-64bit-atomics-on-mips-clang.patch b/recipes-graphics/mesa/files/0001-meson-misdetects-64bit-atomics-on-mips-clang.patch
index 6ce1d4c..35e65e4 100644
--- a/recipes-graphics/mesa/files/0001-meson-misdetects-64bit-atomics-on-mips-clang.patch
+++ b/recipes-graphics/mesa/files/0001-meson-misdetects-64bit-atomics-on-mips-clang.patch
@@ -1,4 +1,4 @@
-From 96a676daf4640b6993551c70560723e51edc3828 Mon Sep 17 00:00:00 2001
+From 994f33977973baeda1956d253827fc3953bfab55 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Mon, 13 Jan 2020 15:23:47 -0800
Subject: [PATCH] meson misdetects 64bit atomics on mips/clang
diff --git a/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch b/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch
index 873cafc..dc89ffc 100644
--- a/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch
+++ b/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch
@@ -1,7 +1,7 @@
-From aae6b7833f86c3504c0c4f880da503164e25ba4a Mon Sep 17 00:00:00 2001
+From fdcbfd2841eb34f44bdf51aeb4ef45811b66fd75 Mon Sep 17 00:00:00 2001
From: Alistair Francis <alistair@alistair23.me>
Date: Thu, 14 Nov 2019 13:04:49 -0800
-Subject: [PATCH 1/5] meson.build: check for all linux host_os combinations
+Subject: [PATCH] meson.build: check for all linux host_os combinations
Make sure that we are also looking for our host_os combinations like
linux-musl etc. when assuming support for DRM/KMS.
@@ -14,15 +14,16 @@ Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Alistair Francis <alistair@alistair23.me>
+
---
meson.build | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meson.build b/meson.build
-index 932eb136681..efc61711f4d 100644
+index ff333961a0d..5931260dd3d 100644
--- a/meson.build
+++ b/meson.build
-@@ -153,7 +153,7 @@ with_any_opengl = with_opengl or with_gles1 or with_gles2
+@@ -158,7 +158,7 @@ with_any_opengl = with_opengl or with_gles1 or with_gles2
# Only build shared_glapi if at least one OpenGL API is enabled
with_shared_glapi = with_shared_glapi and with_any_opengl
@@ -31,7 +32,7 @@ index 932eb136681..efc61711f4d 100644
dri_drivers = get_option('dri-drivers')
if dri_drivers.contains('auto')
-@@ -970,7 +970,7 @@ if cc.compiles('__uint128_t foo(void) { return 0; }',
+@@ -1000,7 +1000,7 @@ if cc.compiles('__uint128_t foo(void) { return 0; }',
endif
# TODO: this is very incomplete
@@ -40,6 +41,3 @@ index 932eb136681..efc61711f4d 100644
pre_args += '-D_GNU_SOURCE'
elif host_machine.system() == 'sunos'
pre_args += '-D__EXTENSIONS__'
---
-2.30.0
-
diff --git a/recipes-graphics/mesa/files/0002-meson.build-make-TLS-ELF-optional.patch b/recipes-graphics/mesa/files/0002-meson.build-make-TLS-ELF-optional.patch
index d0266fb..3d87c97 100644
--- a/recipes-graphics/mesa/files/0002-meson.build-make-TLS-ELF-optional.patch
+++ b/recipes-graphics/mesa/files/0002-meson.build-make-TLS-ELF-optional.patch
@@ -1,4 +1,4 @@
-From 372820ee40ba52f03672477245fafa395dd29009 Mon Sep 17 00:00:00 2001
+From a9253ee295c4684e20aee6022bc9f26c5fc68856 Mon Sep 17 00:00:00 2001
From: Alistair Francis <alistair@alistair23.me>
Date: Wed, 2 Sep 2020 15:28:50 -0500
Subject: [PATCH] meson.build: make TLS ELF optional
@@ -8,16 +8,17 @@ TLS GLX optional again" patch updated to the latest mesa.
Upstream-Status: Inappropriate [configuration]
Signed-off-by: Alistair Francis <alistair@alistair23.me>
+
---
meson.build | 4 +---
meson_options.txt | 6 ++++++
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/meson.build b/meson.build
-index 142f3839e91..d80d795bf66 100644
+index 5931260dd3d..23a3cd66156 100644
--- a/meson.build
+++ b/meson.build
-@@ -449,9 +449,7 @@ endif
+@@ -453,9 +453,7 @@ endif
# Android uses emutls for versions <= P/28. For USE_ELF_TLS we need ELF TLS.
use_elf_tls = false
@@ -27,12 +28,12 @@ index 142f3839e91..d80d795bf66 100644
+if (not with_platform_android or get_option('platform-sdk-version') >= 29) and get_option('elf-tls')
pre_args += '-DUSE_ELF_TLS'
use_elf_tls = true
- endif
+
diff --git a/meson_options.txt b/meson_options.txt
-index 599a2b3fd89..11a4cc532b9 100644
+index 54e15e9f850..118eba3914d 100644
--- a/meson_options.txt
+++ b/meson_options.txt
-@@ -426,6 +426,12 @@ option(
+@@ -439,6 +439,12 @@ option(
value : true,
description : 'Enable direct rendering in GLX and EGL for DRI',
)
@@ -45,6 +46,3 @@ index 599a2b3fd89..11a4cc532b9 100644
option(
'prefer-iris',
type : 'boolean',
---
-2.30.1
-
diff --git a/recipes-graphics/mesa/files/0003-Allow-enable-DRI-without-DRI-drivers.patch b/recipes-graphics/mesa/files/0003-Allow-enable-DRI-without-DRI-drivers.patch
index 90f1372..91f819b 100644
--- a/recipes-graphics/mesa/files/0003-Allow-enable-DRI-without-DRI-drivers.patch
+++ b/recipes-graphics/mesa/files/0003-Allow-enable-DRI-without-DRI-drivers.patch
@@ -1,4 +1,4 @@
-From 19f38c23dc290f2a820c7d2c8b880568cdf90154 Mon Sep 17 00:00:00 2001
+From 96fc2efc4d120fc2bdbc39cc0c656a939790b51e Mon Sep 17 00:00:00 2001
From: Fabio Berton <fabio.berton@ossystems.com.br>
Date: Wed, 12 Jun 2019 14:18:31 -0300
Subject: [PATCH] Allow enable DRI without DRI drivers
@@ -8,16 +8,17 @@ Upstream-Status: Pending
Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
+
---
meson.build | 2 +-
meson_options.txt | 6 ++++++
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
-index af1f63041ce..224d930d4d5 100644
+index 23a3cd66156..f19e59c32fe 100644
--- a/meson.build
+++ b/meson.build
-@@ -188,7 +188,7 @@ with_dri_r100 = dri_drivers.contains('r100')
+@@ -189,7 +189,7 @@ with_dri_r100 = dri_drivers.contains('r100')
with_dri_r200 = dri_drivers.contains('r200')
with_dri_nouveau = dri_drivers.contains('nouveau')
@@ -27,7 +28,7 @@ index af1f63041ce..224d930d4d5 100644
gallium_drivers = get_option('gallium-drivers')
if gallium_drivers.contains('auto')
diff --git a/meson_options.txt b/meson_options.txt
-index fbb86f3f896..a8b021d718e 100644
+index 118eba3914d..f7354104c4a 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -41,6 +41,12 @@ option(
@@ -43,6 +44,3 @@ index fbb86f3f896..a8b021d718e 100644
option(
'dri-drivers',
type : 'array',
---
-2.30.1
-
diff --git a/recipes-graphics/mesa/files/0004-Revert-mesa-Enable-asm-unconditionally-now-that-gen_.patch b/recipes-graphics/mesa/files/0004-Revert-mesa-Enable-asm-unconditionally-now-that-gen_.patch
index 0fee1cb..2ad76a5 100644
--- a/recipes-graphics/mesa/files/0004-Revert-mesa-Enable-asm-unconditionally-now-that-gen_.patch
+++ b/recipes-graphics/mesa/files/0004-Revert-mesa-Enable-asm-unconditionally-now-that-gen_.patch
@@ -1,4 +1,4 @@
-From 0686afe15146bf8bbde7a0ab60147cdb8edfe76c Mon Sep 17 00:00:00 2001
+From 793a0a974e56b072699f8613978acc7d08b8857a Mon Sep 17 00:00:00 2001
From: Alistair Francis <alistair@alistair23.me>
Date: Wed, 2 Sep 2020 15:31:59 -0500
Subject: [PATCH] Revert "mesa: Enable asm unconditionally, now that
@@ -9,6 +9,7 @@ This reverts commit 20294dceebc23236e33b22578245f7e6f41b6997.
Upstream-Status: Inappropriate [configuration]
Signed-off-by: Alistair Francis <alistair@alistair23.me>
+
---
Android.common.mk | 3 +
Android.mk | 7 +++
@@ -19,10 +20,10 @@ Signed-off-by: Alistair Francis <alistair@alistair23.me>
6 files changed, 83 insertions(+), 33 deletions(-)
diff --git a/Android.common.mk b/Android.common.mk
-index 9141ef951d6..cec6f7888c3 100644
+index 7ef6a90a179..061de3bb147 100644
--- a/Android.common.mk
+++ b/Android.common.mk
-@@ -103,9 +103,12 @@ ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo true),true)
+@@ -104,9 +104,12 @@ ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo true),true)
LOCAL_CFLAGS += -DHAVE_SYS_SHM_H
endif
@@ -36,10 +37,10 @@ index 9141ef951d6..cec6f7888c3 100644
ifeq ($(ARCH_ARM_HAVE_NEON),true)
LOCAL_CFLAGS_arm += -DUSE_ARM_ASM
diff --git a/Android.mk b/Android.mk
-index aa2e7f7610e..adc0db69584 100644
+index 3b5d029f804..6ec64abc87c 100644
--- a/Android.mk
+++ b/Android.mk
-@@ -90,6 +90,13 @@ endif
+@@ -96,6 +96,13 @@ endif
$(foreach d, $(MESA_BUILD_CLASSIC) $(MESA_BUILD_GALLIUM), $(eval $(d) := true))
@@ -54,12 +55,12 @@ index aa2e7f7610e..adc0db69584 100644
MESA_ENABLE_LLVM := true
endif
diff --git a/meson.build b/meson.build
-index d80d795bf66..af1f63041ce 100644
+index f19e59c32fe..69a01218792 100644
--- a/meson.build
+++ b/meson.build
-@@ -53,6 +53,9 @@ with_vulkan_icd_dir = get_option('vulkan-icd-dir')
+@@ -55,6 +55,9 @@ with_moltenvk_dir = get_option('moltenvk-dir')
+ with_vulkan_icd_dir = get_option('vulkan-icd-dir')
with_tests = get_option('build-tests')
- with_glcpp_tests = get_option('enable-glcpp-tests')
with_aco_tests = get_option('build-aco-tests')
+with_valgrind = get_option('valgrind')
+with_libunwind = get_option('libunwind')
@@ -67,7 +68,7 @@ index d80d795bf66..af1f63041ce 100644
with_glx_read_only_text = get_option('glx-read-only-text')
with_glx_direct = get_option('glx-direct')
with_osmesa = get_option('osmesa')
-@@ -1210,41 +1213,68 @@ dep_ws2_32 = cc.find_library('ws2_32', required : with_platform_windows)
+@@ -1236,41 +1239,68 @@ dep_ws2_32 = cc.find_library('ws2_32', required : with_platform_windows)
# TODO: shared/static? Is this even worth doing?
@@ -170,10 +171,10 @@ index d80d795bf66..af1f63041ce 100644
endif
diff --git a/meson_options.txt b/meson_options.txt
-index 11a4cc532b9..fbb86f3f896 100644
+index f7354104c4a..648059478fc 100644
--- a/meson_options.txt
+++ b/meson_options.txt
-@@ -250,6 +250,12 @@ option(
+@@ -263,6 +263,12 @@ option(
choices : ['auto', 'true', 'false', 'enabled', 'disabled'],
description : 'Build support for OpenGL ES 2.x and 3.x'
)
@@ -218,6 +219,3 @@ index 16153a3c5bd..ddfd03059c5 100644
ifeq ($(ARCH_X86_HAVE_SSE4_1),true)
LOCAL_WHOLE_STATIC_LIBRARIES := \
---
-2.30.1
-
diff --git a/recipes-graphics/mesa/mesa_git.bb b/recipes-graphics/mesa/mesa_git.bb
index d902e8e..ed58e55 100644
--- a/recipes-graphics/mesa/mesa_git.bb
+++ b/recipes-graphics/mesa/mesa_git.bb
@@ -1,6 +1,6 @@
require recipes-graphics/mesa/mesa.inc
-SRC_URI = "git://gitlab.freedesktop.org/mesa/mesa.git;protocol=https \
+SRC_URI = "git://gitlab.freedesktop.org/mesa/mesa.git;protocol=https;branch=main \
file://0001-meson.build-check-for-all-linux-host_os-combinations.patch \
file://0002-meson.build-make-TLS-ELF-optional.patch \
file://0003-Allow-enable-DRI-without-DRI-drivers.patch \
@@ -9,7 +9,7 @@ SRC_URI = "git://gitlab.freedesktop.org/mesa/mesa.git;protocol=https \
"
LIC_FILES_CHKSUM = "file://docs/license.rst;md5=17a4ea65de7a9ab42437f3131e616a7f"
-SRCREV = "${@oe.utils.conditional("MESA_DEV", "1", "${AUTOREV}", "a084d012a9ee71049749a6209b0a1cd637e113e1", d)}"
+SRCREV = "${@oe.utils.conditional("MESA_DEV", "1", "${AUTOREV}", "26677008b9a7c0ef82f2a7f4b479d3cb06097c66", d)}"
DEFAULT_PREFERENCE = "${@oe.utils.conditional("MESA_DEV", "1", "1", "-1", d)}"
PLATFORMS_remove = "drm surfaceless"
@@ -19,7 +19,7 @@ DRIDRIVERS_class-native = "auto"
DRIDRIVERS_class-nativesdk = "auto"
S = "${WORKDIR}/git"
-PV = "20.4-dev+git${SRCPV}"
+PV = "2x.x-dev+git${SRCPV}"
ERROR_QA_remove = "version-going-backwards"
# Add package to install require files to run tests for mesa
@@ -28,7 +28,7 @@ FILES_${PN}-ci = "${bindir}/deqp-runner.sh ${datadir}/mesa/deqp-*"
do_install_append () {
install -d ${D}/${datadir}/mesa
- install -m 0644 ${S}/.gitlab-ci/deqp-default-skips.txt ${D}/${datadir}/mesa/
+ install -m 0644 ${S}/.gitlab-ci/deqp-all-skips.txt ${D}/${datadir}/mesa/
for f in ${S}/src/freedreno/ci/deqp-freedreno-*; do
install -m 0644 $f ${D}/${datadir}/mesa/
done
diff --git a/recipes-multimedia/alsa/alsa-ucm-conf/0001-ucm2-Separate-the-configuration-lookups-hw-based-fro.patch b/recipes-multimedia/alsa/alsa-ucm-conf/0001-ucm2-Separate-the-configuration-lookups-hw-based-fro.patch
deleted file mode 100644
index b16a241..0000000
--- a/recipes-multimedia/alsa/alsa-ucm-conf/0001-ucm2-Separate-the-configuration-lookups-hw-based-fro.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From 4cfceb1e257a91cf5c1d29f28d1305607bbf58eb Mon Sep 17 00:00:00 2001
-From: Jaroslav Kysela <perex@perex.cz>
-Date: Wed, 3 Feb 2021 17:13:01 +0100
-Subject: [PATCH] ucm2: Separate the configuration lookups (hw based) from the
- configuration tree
-
-Introduce ucm2/conf.d/ tree with symlinks to the real hardware configurations.
-In this way, we do not rely to create the configuration paths based on
-simple driver / device identification, but we can store the configurations
-more logically to make the maintenance (code reuse, multiple changes)
-more easy.
-
-This commit keeps the older lookup paths active, but they will be
-turned off in the next release.
-
-BugLink: https://github.com/alsa-project/alsa-ucm-conf/pull/70
-BugLink: https://github.com/alsa-project/alsa-ucm-conf/pull/76
-BugLink: https://github.com/alsa-project/alsa-ucm-conf/pull/78
-Signed-off-by: Jaroslav Kysela <perex@perex.cz>
----
- ucm2/ucm.conf | 40 +++++++++++++++++++++++++++++++++++-----
- 1 file changed, 35 insertions(+), 5 deletions(-)
-
-diff --git a/ucm2/ucm.conf b/ucm2/ucm.conf
-index 9e78df118f83..8577c300e46b 100644
---- a/ucm2/ucm.conf
-+++ b/ucm2/ucm.conf
-@@ -14,8 +14,9 @@
- Syntax 3
-
- Define.V1 "" # non-empty string to enable ucm v1 paths
--Define.V2Module yes # empty string to disable
--Define.V2Name yes # empty string to disable
-+Define.V2ConfD yes # empty string to disable
-+Define.V2Module yes # non-empty string to enable module name lookups (obsolete)
-+Define.V2Name yes # non-empty string to enable driver & card name lookups (obsolete)
-
- If.driver {
- Condition {
-@@ -40,11 +41,40 @@ If.driver {
- #
- # The probed path when hw-card is found:
- #
-- # ucm2/${KernelModule}/${KernelModule}.conf
-- # ucm2/${CardDriver}/${CardLongName}.conf
-- # ucm2/${CardDriver}/${CardDriver}.conf
-+ # ucm2/conf.d/[${CardDriver}|${KernelDriver}]/${CardLongName}.conf
-+ # ucm2/conf.d/[${CardDriver}|${KernelDriver}]/[${CardDriver}|${KernelDriver}].conf
-+ # ucm2/${KernelModule}/${KernelModule}.conf (obsolete)
-+ # ucm2/${CardDriver}/${CardLongName}.conf (obsolete)
-+ # ucm2/${CardDriver}/${CardDriver}.conf (obsolete)
- #
-
-+ If.V2ConfD {
-+ Condition {
-+ Type String
-+ Empty "${var:V2ConfD}"
-+ }
-+ False {
-+ Define.Driver "${CardDriver}"
-+ If.nodrv {
-+ Condition {
-+ Type String
-+ Empty "${var:Driver}"
-+ }
-+ True.Define {
-+ KernelDriverPath "class/sound/card${CardNumber}/device/driver"
-+ Driver "${sys:$KernelDriverPath}"
-+ }
-+ }
-+ UseCasePath.confd1 {
-+ Directory "conf.d/${var:Driver}"
-+ File "${CardLongName}.conf"
-+ }
-+ UseCasePath.confd2 {
-+ Directory "conf.d/${var:Driver}"
-+ File "${var:Driver}.conf"
-+ }
-+ }
-+ }
- If.V2Module {
- Condition {
- Type String
---
-2.30.0
-
diff --git a/recipes-multimedia/alsa/alsa-ucm-conf/0001-ucm2-codecs-lpass-add-codec-sequences-for-wsa-and-va.patch b/recipes-multimedia/alsa/alsa-ucm-conf/0001-ucm2-codecs-lpass-add-codec-sequences-for-wsa-and-va.patch
deleted file mode 100644
index 7f664b1..0000000
--- a/recipes-multimedia/alsa/alsa-ucm-conf/0001-ucm2-codecs-lpass-add-codec-sequences-for-wsa-and-va.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 5384a0ec52d2d8fd0bbcdab222b47d0887a058e4 Mon Sep 17 00:00:00 2001
-From: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
-Date: Fri, 20 Nov 2020 12:12:48 +0000
-Subject: [PATCH 1/2] ucm2: codecs: lpass: add codec sequences for wsa and va
- macro
-
-Add enable/disable codec sequence for Qualcomm Low Power Audio
-Subsystem (LPASS) Codec WSA and VA Macros.
-
-Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
----
- ucm2/codecs/lpass/va-macro/DMIC0DisableSeq.conf | 3 +++
- ucm2/codecs/lpass/va-macro/DMIC0EnableSeq.conf | 3 +++
- ucm2/codecs/lpass/wsa-macro/SpeakerDisableSeq.conf | 8 ++++++++
- ucm2/codecs/lpass/wsa-macro/SpeakerEnableSeq.conf | 8 ++++++++
- 4 files changed, 22 insertions(+)
- create mode 100644 ucm2/codecs/lpass/va-macro/DMIC0DisableSeq.conf
- create mode 100644 ucm2/codecs/lpass/va-macro/DMIC0EnableSeq.conf
- create mode 100644 ucm2/codecs/lpass/wsa-macro/SpeakerDisableSeq.conf
- create mode 100644 ucm2/codecs/lpass/wsa-macro/SpeakerEnableSeq.conf
-
-diff --git a/ucm2/codecs/lpass/va-macro/DMIC0DisableSeq.conf b/ucm2/codecs/lpass/va-macro/DMIC0DisableSeq.conf
-new file mode 100644
-index 0000000..ec3f45a
---- /dev/null
-+++ b/ucm2/codecs/lpass/va-macro/DMIC0DisableSeq.conf
-@@ -0,0 +1,5 @@
-+DisableSequence [
-+ cset "name='VA DMIC MUX0' ZERO"
-+ cset "name='VA_DEC0 Volume' 0"
-+ cset "name='VA_AIF1_CAP Mixer DEC0' 0"
-+]
-diff --git a/ucm2/codecs/lpass/va-macro/DMIC0EnableSeq.conf b/ucm2/codecs/lpass/va-macro/DMIC0EnableSeq.conf
-new file mode 100644
-index 0000000..bd6e8f5
---- /dev/null
-+++ b/ucm2/codecs/lpass/va-macro/DMIC0EnableSeq.conf
-@@ -0,0 +1,5 @@
-+EnableSequence [
-+ cset "name='VA DMIC MUX0' DMIC0"
-+ cset "name='VA_AIF1_CAP Mixer DEC0' 1"
-+ cset "name='VA_DEC0 Volume' 100"
-+]
-diff --git a/ucm2/codecs/lpass/wsa-macro/SpeakerDisableSeq.conf b/ucm2/codecs/lpass/wsa-macro/SpeakerDisableSeq.conf
-new file mode 100644
-index 0000000..1f27d4c
---- /dev/null
-+++ b/ucm2/codecs/lpass/wsa-macro/SpeakerDisableSeq.conf
-@@ -0,0 +1,10 @@
-+DisableSequence [
-+ cset "name='WSA_RX0 Digital Volume' 0"
-+ cset "name='WSA_RX1 Digital Volume' 0"
-+ cset "name='WSA_COMP1 Switch' 0"
-+ cset "name='WSA_COMP2 Switch' 0"
-+ cset "name='WSA_RX0 INP0' ZERO"
-+ cset "name='WSA_RX1 INP0' ZERO"
-+ cset "name='WSA RX0 MUX' ZERO"
-+ cset "name='WSA RX1 MUX' ZERO"
-+]
-diff --git a/ucm2/codecs/lpass/wsa-macro/SpeakerEnableSeq.conf b/ucm2/codecs/lpass/wsa-macro/SpeakerEnableSeq.conf
-new file mode 100644
-index 0000000..618bab4
---- /dev/null
-+++ b/ucm2/codecs/lpass/wsa-macro/SpeakerEnableSeq.conf
-@@ -0,0 +1,10 @@
-+EnableSequence [
-+ cset "name='WSA RX0 MUX' AIF1_PB"
-+ cset "name='WSA RX1 MUX' AIF1_PB"
-+ cset "name='WSA_RX0 INP0' RX0"
-+ cset "name='WSA_RX1 INP0' RX1"
-+ cset "name='WSA_COMP1 Switch' 1"
-+ cset "name='WSA_COMP2 Switch' 1"
-+ cset "name='WSA_RX0 Digital Volume' 68"
-+ cset "name='WSA_RX1 Digital Volume' 68"
-+]
diff --git a/recipes-multimedia/alsa/alsa-ucm-conf/0001-ucm2-conf.d-add-symlinks-for-Qualcomm-cards.patch b/recipes-multimedia/alsa/alsa-ucm-conf/0001-ucm2-conf.d-add-symlinks-for-Qualcomm-cards.patch
deleted file mode 100644
index bd93c9f..0000000
--- a/recipes-multimedia/alsa/alsa-ucm-conf/0001-ucm2-conf.d-add-symlinks-for-Qualcomm-cards.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 2957017f9ca01b0e1e127c04ba47e0147bff7e47 Mon Sep 17 00:00:00 2001
-From: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
-Date: Fri, 5 Feb 2021 20:45:40 +0300
-Subject: [PATCH] ucm2/conf.d: add symlinks for Qualcomm cards
-
-Add ucm2/conf.d symlinks for all defined Qualcomm sound cards.
-
-Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
----
- ucm2/conf.d/DB820c/DB820c.conf | 1 +
- ucm2/conf.d/DB410c/DB410c.conf | 1 +
- ucm2/conf.d/sdm845/DB845c.conf | 1 +
- 4 files changed, 4 insertions(+)
- create mode 120000 ucm2/conf.d/DB820c/DB820c.conf
- create mode 120000 ucm2/conf.d/DB410c/DB410c.conf
- create mode 120000 ucm2/conf.d/sdm845/DB845c.conf
-
-diff --git a/ucm2/conf.d/DB820c/DB820c.conf b/ucm2/conf.d/DB820c/DB820c.conf
-new file mode 120000
-index 000000000000..b8ceeabaa70d
---- /dev/null
-+++ b/ucm2/conf.d/DB820c/DB820c.conf
-@@ -0,0 +1 @@
-+../../Qualcomm/apq8096/apq8096.conf
-\ No newline at end of file
-diff --git a/ucm2/conf.d/DB410c/DB410c.conf b/ucm2/conf.d/DB410c/DB410c.conf
-new file mode 120000
-index 000000000000..551122e14c16
---- /dev/null
-+++ b/ucm2/conf.d/DB410c/DB410c.conf
-@@ -0,0 +1 @@
-+../../Qualcomm/apq8016-sbc/apq8016-sbc.conf
-\ No newline at end of file
-diff --git a/ucm2/conf.d/sdm845/DB845c.conf b/ucm2/conf.d/sdm845/DB845c.conf
-new file mode 120000
-index 000000000000..fad79da8dd8e
---- /dev/null
-+++ b/ucm2/conf.d/sdm845/DB845c.conf
-@@ -0,0 +1 @@
-+../../Qualcomm/sdm845/sdm845.conf
-\ No newline at end of file
---
-2.30.0
-
diff --git a/recipes-multimedia/alsa/alsa-ucm-conf/0002-ucm2-add-support-to-for-Qualcomm-RB5-Platform.patch b/recipes-multimedia/alsa/alsa-ucm-conf/0002-ucm2-add-support-to-for-Qualcomm-RB5-Platform.patch
deleted file mode 100644
index b972cf5..0000000
--- a/recipes-multimedia/alsa/alsa-ucm-conf/0002-ucm2-add-support-to-for-Qualcomm-RB5-Platform.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-From 382366c1f615613e088982a6c30fc90b3226ae8b Mon Sep 17 00:00:00 2001
-From: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
-Date: Fri, 20 Nov 2020 12:14:31 +0000
-Subject: [PATCH 2/2] ucm2: add support to for Qualcomm RB5 Platform
-
-The Qualcomm RB5 Robotics Platform contains HDMI,
-2x WSA Smart-Speakers audio outputs along with One
-Onboard DMIC audio input.
-
-Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
----
- ucm2/Qualcomm/sm8250/HDMI.conf | 26 ++++++++++++
- ucm2/Qualcomm/sm8250/HiFi.conf | 46 ++++++++++++++++++++++
- .../Qualcomm-RB5-WSA8815-Speakers-DMIC0.conf | 11 ++++++
- ucm2/conf.d/sm8250/Qualcomm-RB5-WSA8815-Speakers-DMIC0.conf | 1 +
- 4 files changed, 84 insertions(+)
- create mode 100644 ucm2/Qualcomm/sm8250/HDMI.conf
- create mode 100644 ucm2/Qualcomm/sm8250/HiFi.conf
- create mode 100644 ucm2/Qualcomm/sm8250/Qualcomm-RB5-WSA8815-Speakers-DMIC0.conf
- create mode 120000 ucm2/conf.d/sm8250/Qualcomm-RB5-WSA8815-Speakers-DMIC0.conf
-
-diff --git a/ucm2/Qualcomm/sm8250/HDMI.conf b/ucm2/Qualcomm/sm8250/HDMI.conf
-new file mode 100644
-index 0000000..a9594fd
---- /dev/null
-+++ b/ucm2/Qualcomm/sm8250/HDMI.conf
-@@ -0,0 +1,26 @@
-+# Use case configuration for RB5 board.
-+# Author: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
-+
-+SectionVerb {
-+ EnableSequence [
-+ cset "name='TERT_MI2S_RX Audio Mixer MultiMedia1' 1"
-+ ]
-+
-+ DisableSequence [
-+ cset "name='TERT_MI2S_RX Audio Mixer MultiMedia1' 0"
-+ ]
-+
-+ Value {
-+ TQ "HiFi"
-+ }
-+}
-+
-+SectionDevice."HDMI" {
-+ #Name "HDMI"
-+ Comment "HDMI Digital Stereo Output"
-+
-+ Value {
-+ PlaybackPCM "hw:${CardId}"
-+ PlaybackPriority 200
-+ }
-+}
-diff --git a/ucm2/Qualcomm/sm8250/HiFi.conf b/ucm2/Qualcomm/sm8250/HiFi.conf
-new file mode 100644
-index 0000000..a310402
---- /dev/null
-+++ b/ucm2/Qualcomm/sm8250/HiFi.conf
-@@ -0,0 +1,46 @@
-+# Use case configuration for Qualcomm RB5.
-+# Author: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
-+
-+SectionVerb {
-+
-+ EnableSequence [
-+ cset "name='WSA_CODEC_DMA_RX_0 Audio Mixer MultiMedia2' 1"
-+ cset "name='MultiMedia3 Mixer VA_CODEC_DMA_TX_0' 1"
-+ ]
-+
-+ Include.wsae.File "/codecs/wsa881x/DefaultEnableSeq.conf"
-+
-+ DisableSequence [
-+ cset "name='WSA_CODEC_DMA_RX_0 Audio Mixer MultiMedia2' 0"
-+ cset "name='MultiMedia3 Mixer VA_CODEC_DMA_TX_0' 0"
-+ ]
-+
-+ Value {
-+ TQ "HiFi"
-+ }
-+}
-+
-+SectionDevice."Speaker" {
-+ Comment "Speaker playback"
-+
-+ Include.lpasswsae.File "/codecs/lpass/wsa-macro/SpeakerEnableSeq.conf"
-+ Include.wsae.File "/codecs/wsa881x/SpeakerEnableSeq.conf"
-+ Include.wsad.File "/codecs/wsa881x/SpeakerDisableSeq.conf"
-+ Include.lpasswsad.File "/codecs/lpass/wsa-macro/SpeakerDisableSeq.conf"
-+
-+ Value {
-+ PlaybackPriority 100
-+ PlaybackPCM "hw:${CardId},1"
-+ }
-+}
-+
-+SectionDevice."Mic" {
-+ Comment "Mic"
-+ Include.lpassvad.File "/codecs/lpass/va-macro/DMIC0EnableSeq.conf"
-+ Include.lpassvad.File "/codecs/lpass/va-macro/DMIC0DisableSeq.conf"
-+
-+ Value {
-+ CapturePriority 100
-+ CapturePCM "hw:${CardId},2"
-+ }
-+}
-diff --git a/ucm2/Qualcomm/sm8250/Qualcomm-RB5-WSA8815-Speakers-DMIC0.conf b/ucm2/Qualcomm/sm8250/Qualcomm-RB5-WSA8815-Speakers-DMIC0.conf
-new file mode 100644
-index 0000000..2fbca31
---- /dev/null
-+++ b/ucm2/Qualcomm/sm8250/Qualcomm-RB5-WSA8815-Speakers-DMIC0.conf
-@@ -0,0 +1,11 @@
-+Syntax 3
-+
-+SectionUseCase."HiFi" {
-+ File "/Qualcomm/sm8250/HiFi.conf"
-+ Comment "HiFi quality Music."
-+}
-+
-+SectionUseCase."HDMI" {
-+ File "/Qualcomm/sm8250/HDMI.conf"
-+ Comment "HDMI output."
-+}
-diff --git a/ucm2/conf.d/sm8250/Qualcomm-RB5-WSA8815-Speakers-DMIC0.conf b/ucm2/conf.d/sm8250/Qualcomm-RB5-WSA8815-Speakers-DMIC0.conf
-new file mode 120000
-index 000000000000..9f551b74ebf2
---- /dev/null
-+++ b/ucm2/conf.d/sm8250/Qualcomm-RB5-WSA8815-Speakers-DMIC0.conf
-@@ -0,0 +1 @@
-+../../Qualcomm/sm8250/Qualcomm-RB5-WSA8815-Speakers-DMIC0.conf
-\ No newline at end of file
diff --git a/recipes-multimedia/alsa/alsa-ucm-conf_%.bbappend b/recipes-multimedia/alsa/alsa-ucm-conf_%.bbappend
deleted file mode 100644
index ef4fa85..0000000
--- a/recipes-multimedia/alsa/alsa-ucm-conf_%.bbappend
+++ /dev/null
@@ -1,8 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
-
-SRC_URI_append_qcom = "\
- file://0001-ucm2-Separate-the-configuration-lookups-hw-based-fro.patch \
- file://0001-ucm2-codecs-lpass-add-codec-sequences-for-wsa-and-va.patch \
- file://0002-ucm2-add-support-to-for-Qualcomm-RB5-Platform.patch \
- file://0001-ucm2-conf.d-add-symlinks-for-Qualcomm-cards.patch \
-"
diff --git a/recipes-support/fastrpc/fastrpc/mount-dsp.sh b/recipes-support/fastrpc/fastrpc/mount-dsp.sh
index 1bacfb8..45363a4 100644
--- a/recipes-support/fastrpc/fastrpc/mount-dsp.sh
+++ b/recipes-support/fastrpc/fastrpc/mount-dsp.sh
@@ -2,16 +2,25 @@
set -e
+modprobe socinfo || true
+
if [ -r /sys/devices/soc0/machine ] ; then
MACHINE=`cat /sys/devices/soc0/machine`
case $MACHINE in
- SM8250|QRB5160)
+ SM8250|QRB5165)
WHAT=/lib/firmware/qcom/sm8250/dspso.bin
;;
esac
fi
-if [ -z "$WHAT" -o ! -r "$WHAT"] ; then
+if [ -z "$WHAT" -o ! -r "$WHAT" ] ; then
+ i=0
+ while ! [ -d /dev/disk/by-partlabel ] ; do
+ i=$(( $i + 1))
+ [ $i -gt 30 ] && break;
+ sleep 1
+ done
+
if [ -h /dev/disk/by-partlabel/dsp_a ] ; then
WHAT=/dev/disk/by-partlabel/dsp_a
else
diff --git a/recipes-support/fastrpc/fastrpc_git.bb b/recipes-support/fastrpc/fastrpc_git.bb
index 179d42b..0664277 100644
--- a/recipes-support/fastrpc/fastrpc_git.bb
+++ b/recipes-support/fastrpc/fastrpc_git.bb
@@ -5,7 +5,7 @@ SECTION = "devel"
LICENSE = "BSD-3-Clause"
LIC_FILES_CHKSUM = "file://src/fastrpc_apps_user.c;beginline=1;endline=29;md5=f94f3a7beba14ae2f59f817e9634f891"
-SRCREV = "bc36c705c9b057ca880a423021d3c19f02edeadd"
+SRCREV = "5a8320c46df8c0dbefe71d97a8273f417e8721f3"
SRC_URI = "\
git://git.linaro.org/landing-teams/working/qualcomm/fastrpc.git;branch=automake;protocol=https \
file://0001-apps_std_fopen_with_env-account-for-domain-kinds-whe.patch \