firmware-{oneplus,shift}-sdm845: fix loading a630 firmware files

Currently, loading the a630 firmware files fails in the iniramfs
when the display is manually configured. This firmware is loaded
once the rootfs is loaded and the gpu is polled, but the error
messages clog the early boot logs and can make parsing them much
harder. Because of this, and because these devices don't have an
issue with bootimg size, including the firmware is a QOL change.

Signed-off-by: Aster Boese <asterboese@mailbox.org>
Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/8649>
This commit is contained in:
Aster Boese
2026-08-02 14:29:51 +00:00
parent ccc3df49a8
commit f4fd89a374
4 changed files with 31 additions and 13 deletions
@@ -1,6 +1,6 @@
maintainer="Casey Connolly <kcxt@postmarketos.org>"
pkgname=firmware-oneplus-sdm845
pkgver=17
pkgver=18
pkgrel=0
_commit="3e31a0c3e5a061645c09f805387b49fa9d35acbf"
pkgdesc="Firmware for OnePlus 6 / 6T"
@@ -12,11 +12,12 @@ subpackages="
$pkgname-pmtest
$pkgname-sensors:firmware_sensors
"
source="$pkgname-$_commit.tar.gz::https://gitlab.com/sdm845-mainline/firmware-oneplus-sdm845/-/archive/$_commit/$pkgname-$_commit.tar.gz
firmware.files
sensor.files
30-oneplus-sdm845-firmware-ci.files
source="$pkgname-$_commit.tar.gz::https://gitlab.com/sdm845-mainline/firmware-oneplus-sdm845/-/archive/$_commit/firmware-oneplus-sdm845-$_commit.tar.gz
0001-oneplus6-set-mount-matrix.patch
30-oneplus-sdm845-firmware-ci.files
firmware.files
firmware-initramfs.files
sensor.files
"
options="!archcheck !check !strip !tracedeps pmb:cross-native textrels"
builddir="$srcdir/$pkgname-$_commit"
@@ -27,6 +28,9 @@ package() {
[ ! -d $(dirname $_i) ] && mkdir -p $(dirname "$pkgdir"/$_i)
install -Dm644 .$_u "$pkgdir/$_i"
done < "$srcdir/firmware.files"
install -Dm644 "$srcdir"/firmware-initramfs.files \
"$pkgdir"/usr/share/mkinitfs/files/"$pkgname".files
}
pmtest() {
@@ -54,8 +58,9 @@ firmware_sensors() {
sha512sums="
56604c46ad0f30f1f715af4b83bd2686d96723024063c7ef6baa5c73cd52b375478e3d65b886ff08efc95ce129fc789b8509efcdf9f0d46cf7229f4ec1afa513 firmware-oneplus-sdm845-3e31a0c3e5a061645c09f805387b49fa9d35acbf.tar.gz
aefc540de7d67df936108750ea4ad95101eacf5cbc0243d849d7267932fa0d3ef602f9e461ba003d3953f5e81b77b798df0a5c43d179269ceb5c71f73ab23c0a firmware.files
f3e4e1ca689400492d9860fbe478d781bcf3d0b7d1b018bc23309d4a0458dc693554c198d79a4048436e0a04e1ea9d07b004c63d297a4eb423a7ea355fc21f95 sensor.files
ed8e0c4437c4f9b1ad34337d57eb3fbcc66dbcd520864642ff704e48b1656e6b2970f61c4f7ea264bd7aefedc07d8b7f7fb12569b0218a6f56ab5daf6946d9e9 30-oneplus-sdm845-firmware-ci.files
3f5b04afd8ccd08e676cee2d290c08c3b5e0f0c0b85ddf6e94f86730615ea174a2cc57452dc8455f68675fc173bf0fb79c0505819c3e0203ad5a7acb5ebf4b10 0001-oneplus6-set-mount-matrix.patch
ed8e0c4437c4f9b1ad34337d57eb3fbcc66dbcd520864642ff704e48b1656e6b2970f61c4f7ea264bd7aefedc07d8b7f7fb12569b0218a6f56ab5daf6946d9e9 30-oneplus-sdm845-firmware-ci.files
aefc540de7d67df936108750ea4ad95101eacf5cbc0243d849d7267932fa0d3ef602f9e461ba003d3953f5e81b77b798df0a5c43d179269ceb5c71f73ab23c0a firmware.files
36233430bb992ef878bb17796bb31e98c13209e2bf594dbd934c95249338bb6f26e4a0d5e6e722aec9248009a21927d5f0ca736cae96aa5c71ed2223b7d5cc9d firmware-initramfs.files
f3e4e1ca689400492d9860fbe478d781bcf3d0b7d1b018bc23309d4a0458dc693554c198d79a4048436e0a04e1ea9d07b004c63d297a4eb423a7ea355fc21f95 sensor.files
"
@@ -0,0 +1,4 @@
# Needs to be loaded in the initramfs alongside msm_dpu
/usr/lib/firmware/qcom/a630_gmu.bin
/usr/lib/firmware/qcom/a630_sqe.fw
/usr/lib/firmware/qcom/sdm845/OnePlus/enchilada/a630_zap.mbn
@@ -1,7 +1,7 @@
maintainer="Alexander Martinz <amartinz@shiftphones.com>"
pkgname=firmware-shift-sdm845
pkgver=20260428
pkgrel=3
pkgrel=4
_commit="a3ff3738b8ba541561d790b84f6ee82b28ed5d43"
pkgdesc="Firmware for SHIFT sdm845 devices"
url="https://gitlab.com/sdm845-mainline/firmware-shift-sdm845"
@@ -18,9 +18,10 @@ subpackages="
# Textrels appear in DSP libraries which we cannot avoid
options="!archcheck !check !strip !tracedeps pmb:cross-native textrels"
source="$pkgname-$_commit.tar.gz::https://gitlab.com/sdm845-mainline/firmware-shift-sdm845/-/archive/$_commit/firmware-shift-sdm845-$_commit.tar.gz
firmware.files
sensors.files
30-shift-sdm845-firmware-ci.files
firmware.files
firmware-initramfs.files
sensors.files
"
builddir="$srcdir/$pkgname-$_commit"
@@ -31,6 +32,9 @@ package() {
install -Dm644 "$builddir""$_u" "$pkgdir/$_i"
done < "$srcdir/firmware.files"
install -Dm644 "$srcdir"/firmware-initramfs.files \
"$pkgdir"/usr/share/mkinitfs/files/"$pkgname".files
# Install symlinks for using upstream firmware
ln -s ../../mba.mbn.zst "$pkgdir"/usr/lib/firmware/qcom/sdm845/SHIFT/axolotl/mba.mbn.zst
ln -s ../../../../ath10k/WCN3990/hw1.0/wlanmdsp.mbn.zst "$pkgdir"/usr/lib/firmware/qcom/sdm845/SHIFT/axolotl/wlanmdsp.mbn.zst
@@ -58,7 +62,8 @@ firmware_sensors() {
sha512sums="
a2df649f0395f63cba08ff2d6c737855b056776ab0dd73a8fc5f24ae86513e80d4d97a3e7378813836cb0b5ec12d60b9e28dd22a3e9be1c382e0993ae83af01c firmware-shift-sdm845-a3ff3738b8ba541561d790b84f6ee82b28ed5d43.tar.gz
4d541f6ee4261e37dbc7b0dd0a00c3d3e856d6fc6701eab174bd01c4aaed379bf1a65ba46f6db933fa315104a296c5660aaba213bde4e82523299fd4ee0dc18c firmware.files
d46270ee01e1f0140d9b89aa9a84af1f1a05e2576284694d678ad8182ab52c8cfb152559c38e3150189cafb2e4614f55fef945aafeaee47f5b9a66a18cfbcb92 sensors.files
8b9058b07bc9cab0bb21ddf2c358fdaf8dc3063df6118f2e0c6c1f2da86e4ab250a95039cab2f9185976c2fd450ed92633f18f71bec61980f801028e814c0e73 30-shift-sdm845-firmware-ci.files
4d541f6ee4261e37dbc7b0dd0a00c3d3e856d6fc6701eab174bd01c4aaed379bf1a65ba46f6db933fa315104a296c5660aaba213bde4e82523299fd4ee0dc18c firmware.files
f487c1b867062c7e1cbfae337fcc218bdf81713c8f6b896bc9ad65ca30cc68e59ba8a801540a59062b152a583dc75bf69c5177cbd6cd43267a7783e908f8787d firmware-initramfs.files
d46270ee01e1f0140d9b89aa9a84af1f1a05e2576284694d678ad8182ab52c8cfb152559c38e3150189cafb2e4614f55fef945aafeaee47f5b9a66a18cfbcb92 sensors.files
"
@@ -0,0 +1,4 @@
# Needs to be loaded in the initramfs alongside msm_dpu
/usr/lib/firmware/qcom/a630_gmu.bin
/usr/lib/firmware/qcom/a630_sqe.fw
/usr/lib/firmware/qcom/sdm845/SHIFT/axolotl/a630_zap.mbn