aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAníbal Limón <anibal.limon@linaro.org>2020-08-31 08:40:38 -0500
committerAníbal Limón <anibal.limon@linaro.org>2020-09-02 14:44:28 -0500
commita7e813892860991a6ff012ecd4ac34cfdf6d3eac (patch)
treee47a990d8c3980c0837db45a53d44ea4fd0e9c74
parentea760dbb865a864fde1958d4f931969dee19c9fd (diff)
downloadmeta-qcom-a7e813892860991a6ff012ecd4ac34cfdf6d3eac.tar.gz
meta-qcom-a7e813892860991a6ff012ecd4ac34cfdf6d3eac.tar.bz2
meta-qcom-a7e813892860991a6ff012ecd4ac34cfdf6d3eac.zip
Use venus 5.2 from linux-firmware for DB845c.
A fix was add on mainline to support linux-firmware binary, https://git.linaro.org/landing-teams/working/qualcomm/kernel.git/commit/?h=release/qcomlt-5.7&id=21bb88052948b35bdce926f301f2ba7970040812 Signed-off-by: Aníbal Limón <anibal.limon@linaro.org>
-rw-r--r--conf/machine/dragonboard-845c.conf1
-rw-r--r--recipes-bsp/firmware/firmware-qcom-dragonboard845c_20190529180356-v4.bb6
-rw-r--r--recipes-kernel/linux-firmware/linux-firmware_%.bbappend7
3 files changed, 1 insertions, 13 deletions
diff --git a/conf/machine/dragonboard-845c.conf b/conf/machine/dragonboard-845c.conf
index b9dde33..61d02d6 100644
--- a/conf/machine/dragonboard-845c.conf
+++ b/conf/machine/dragonboard-845c.conf
@@ -19,6 +19,7 @@ MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += " \
linux-firmware-qcom-sdm845-audio \
linux-firmware-qcom-sdm845-compute \
${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'linux-firmware-qcom-adreno-a630 mesa-driver-msm', '', d)} \
+ linux-firmware-qcom-venus-5.2 \
"
# /dev/sda1 is 'rootfs' partition after installing the latest bootloader package from linaro
diff --git a/recipes-bsp/firmware/firmware-qcom-dragonboard845c_20190529180356-v4.bb b/recipes-bsp/firmware/firmware-qcom-dragonboard845c_20190529180356-v4.bb
index 88a1a6c..9433538 100644
--- a/recipes-bsp/firmware/firmware-qcom-dragonboard845c_20190529180356-v4.bb
+++ b/recipes-bsp/firmware/firmware-qcom-dragonboard845c_20190529180356-v4.bb
@@ -27,14 +27,12 @@ do_compile() {
do_install() {
install -d ${D}${nonarch_base_libdir}/firmware/
- install -d ${D}${nonarch_base_libdir}/firmware/qcom/venus-5.2/
install -d ${D}${nonarch_base_libdir}/firmware/qcom/sdm845
install -m 0444 ./17-USB3-201-202-FW/K2026090.mem ${D}${nonarch_base_libdir}/firmware/
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
install -m 0444 ./21-cdsp_split/firmware/cdsp*.* ${D}${nonarch_base_libdir}/firmware/qcom/sdm845
- install -m 0444 ./33-venus_split/venus.* ${D}${nonarch_base_libdir}/firmware/qcom/venus-5.2/
install -d ${D}${nonarch_base_libdir}/firmware/ath10k/WCN3990/hw1.0/
install -m 0444 ./board-2.bin ${D}${nonarch_base_libdir}/firmware/ath10k/WCN3990/hw1.0/
@@ -46,10 +44,6 @@ do_install() {
FILES_${PN} += "${nonarch_base_libdir}/firmware/*"
INSANE_SKIP_${PN} += "arch"
-RPROVIDES_${PN} += "linux-firmware-qcom-venus-5.2"
-RREPLACES_${PN} += "linux-firmware-qcom-venus-5.2"
-RCONFLICTS_${PN} += "linux-firmware-qcom-venus-5.2"
-
RPROVIDES_${PN} += "linux-firmware-qcom-license"
RREPLACES_${PN} += "linux-firmware-qcom-license"
RCONFLICTS_${PN} += "linux-firmware-qcom-license"
diff --git a/recipes-kernel/linux-firmware/linux-firmware_%.bbappend b/recipes-kernel/linux-firmware/linux-firmware_%.bbappend
deleted file mode 100644
index 9a1115c..0000000
--- a/recipes-kernel/linux-firmware/linux-firmware_%.bbappend
+++ /dev/null
@@ -1,7 +0,0 @@
-
-do_install_append() {
- rm -rf ${D}${nonarch_base_libdir}/firmware/qcom/venus-5.2
- rm -rf ${D}${nonarch_base_libdir}/firmware/qcom/venus-5.4
-}
-
-