firmware-oneplus-msm8998: use as much as possible from linux-firmware-* (MR 3531)

The qca (Bluetooth) and qcom (non-zap GPU) firmware blobs don't need to
be signed by the OEM, so let's use upstream versions to benefit from
fixes and updates done there.
This commit is contained in:
Jami Kettunen 2022-03-30 01:12:22 +03:00 committed by Newbyte
parent 8ed8d07043
commit fbd0ebc602
No known key found for this signature in database
GPG key ID: 5873C171C9429CFA
2 changed files with 6 additions and 12 deletions

View file

@ -1,15 +1,15 @@
# Maintainer: Jami Kettunen <jami.kettunen@protonmail.com>
pkgname=firmware-oneplus-msm8998
pkgver=10.0.1
pkgrel=1
pkgrel=2
_commit="a1a0dfd9be6fe250559c01678569e5295a4c335d"
pkgdesc="Firmware for OnePlus 5/5T"
url="https://github.com/JamiKettunen/firmware-mainline-oneplus5"
# Conflicts with ath10k/WCN3990/hw1.0/firmware-5.bin, qca/cr{btfw21.tlv,nv21.bin} & qcom/a530_p{fp,m4}.fw
replaces="linux-firmware-ath10k linux-firmware-qca linux-firmware-qcom"
# Conflicts with ath10k/WCN3990/hw1.0/firmware-5.bin; here we enable the
# "single-chan-info-per-channel" feature to suppresss "chan info event" warning spam from dmesg
replaces="linux-firmware-ath10k"
arch="aarch64"
# soc-qcom-sdm845-nonfree-firmware is also applicable to msm8998
depends="soc-qcom-sdm845-nonfree-firmware qcom-diag"
depends="firmware-qcom-adreno-a530 linux-firmware-qca soc-qcom-msm8998-nonfree-firmware"
install="$pkgname.post-install"
license="proprietary"
options="!check !archcheck !strip !tracedeps"
@ -29,8 +29,6 @@ package() {
firmware_initramfs() {
pkgdesc="Files to be included in the initramfs to support osk-sdl"
depends="$pkgname mesa-egl mesa-gbm"
install_if="$pkgname"
install -Dm644 "$srcdir"/30-gpu-firmware.files \
"$subpkgdir"/etc/postmarketos-mkinitfs/files/30-gpu-firmware.files
@ -39,5 +37,5 @@ firmware_initramfs() {
sha512sums="
c8997e5b2fde1c57651234be63f84b6f8d62f29fc8b55d8ebb8268cb7636241f7f5d11609bbcae71bd734eca9fd857330755979ad3e432a0c7bc6f3b034ea710 firmware-oneplus-msm8998-a1a0dfd9be6fe250559c01678569e5295a4c335d.tar.gz
c29e0abb08dd345d88223e29e49290226d0df63470a809ef3c933f7f088f709fd54da6d01c9a7c249b42e84fb86ca39a20a38e5055d3d1c53f37e4a3ab892a16 30-gpu-firmware.files
b1914c193421eb3cfd49f1cd06e82693a4b895b31381bf423215741a4a8679f290cf6720cedf264696392524ea2899fc5287ef0de9412c7a1e910451dcdf9513 firmware.files
10366f7944ac83a765217f3f10343913c0b72fdd0c5a6e76ffcb87bbe045c270fd1d9499798956f5bcccd2440e71f6d80067b6a22358b6939827f2e71f363777 firmware.files
"

View file

@ -1,9 +1,5 @@
ath10k/WCN3990/hw1.0/board-2.bin
ath10k/WCN3990/hw1.0/firmware-5.bin
qca/crbtfw21.tlv
qca/crnv21.bin
qcom/a530_pfp.fw
qcom/a530_pm4.fw
qcom/a540_gpmu.fw2
qcom/msm8998/oneplus/a540_zap.mbn
qcom/msm8998/oneplus/adsp.mbn