aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAníbal Limón <anibal.limon@linaro.org>2020-05-18 21:32:13 -0500
committerAníbal Limón <anibal.limon@linaro.org>2020-05-20 09:35:43 -0500
commit07fceedf0c24f3953a29838c2a4b6255b0fdf6a7 (patch)
tree105e0dabb55e7b63b008b2d355b3a43bb9a056a1
parent6d7bf0e2a1f9097d997b823fead70e972a5bf798 (diff)
downloadmeta-qcom-07fceedf0c24f3953a29838c2a4b6255b0fdf6a7.tar.gz
meta-qcom-07fceedf0c24f3953a29838c2a4b6255b0fdf6a7.tar.bz2
meta-qcom-07fceedf0c24f3953a29838c2a4b6255b0fdf6a7.zip
dragonboard-845c: Switch to use linux-firmware-{ath10k, qcom-{sdm845, adreno-a630}}
The bdwlan is needed to generate board-2.bin not useful alone, the same for wlan parts that are now in linux-firmware-qcom-sdm845-modem. Finally install a630_zap*.* firmware inside /lib/firmware/qcom the remaining parts are now on linux-firmware-qcom-adreno-a630. Signed-off-by: Aníbal Limón <anibal.limon@linaro.org>
-rw-r--r--conf/machine/dragonboard-845c.conf7
-rw-r--r--recipes-bsp/firmware/firmware-qcom-dragonboard845c_20190529180356-v4.bb8
2 files changed, 6 insertions, 9 deletions
diff --git a/conf/machine/dragonboard-845c.conf b/conf/machine/dragonboard-845c.conf
index 9effb74..b9dde33 100644
--- a/conf/machine/dragonboard-845c.conf
+++ b/conf/machine/dragonboard-845c.conf
@@ -14,8 +14,11 @@ SERIAL_CONSOLE ?= "115200 ttyMSM0"
MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += " \
firmware-qcom-dragonboard845c \
kernel-modules \
- ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'linux-firmware-qca', '', d)} \
- ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-msm', '', d)} \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'linux-firmware-ath10k linux-firmware-qcom-sdm845-modem', '', d)} \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'linux-firmware-qca linux-firmware-qcom-sdm845-modem', '', d)} \
+ 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)} \
"
# /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 c27bbbc..6d36a49 100644
--- a/recipes-bsp/firmware/firmware-qcom-dragonboard845c_20190529180356-v4.bb
+++ b/recipes-bsp/firmware/firmware-qcom-dragonboard845c_20190529180356-v4.bb
@@ -22,12 +22,10 @@ do_install() {
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*.* ${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 -m 0444 ./37-wlan_FW/wlanmdsp.mbn ${D}${nonarch_base_libdir}/firmware/
- install -m 0444 ./38-bdwlan_split/bdwlan*.* ${D}${nonarch_base_libdir}/firmware/
install -d ${D}${sysconfdir}/
install -m 0644 LICENSE.qcom.txt ${D}${sysconfdir}/QCOM-LINUX-BOARD-SUPPORT-LICENSE
@@ -36,10 +34,6 @@ do_install() {
FILES_${PN} += "${nonarch_base_libdir}/firmware/*"
INSANE_SKIP_${PN} += "arch"
-RPROVIDES_${PN} += "linux-firmware-qcom-adreno-a630"
-RREPLACES_${PN} += "linux-firmware-qcom-adreno-a630"
-RCONFLICTS_${PN} += "linux-firmware-qcom-adreno-a630"
-
RPROVIDES_${PN} += "linux-firmware-qcom-venus-5.2"
RREPLACES_${PN} += "linux-firmware-qcom-venus-5.2"
RCONFLICTS_${PN} += "linux-firmware-qcom-venus-5.2"