firmware-oneplus-sdm845: drop initramfs firmware (MR 4599)

Now that we're using unl0kr, we don't need the GPU firmware in the
initramfs.

Signed-off-by: Caleb Connolly <caleb@connolly.tech>
This commit is contained in:
Caleb Connolly 2023-12-05 16:36:21 +00:00 committed by Caleb Connolly
parent 8f81ee8d06
commit d2560bfb89
No known key found for this signature in database
GPG key ID: 7930459FB9303217
4 changed files with 4 additions and 22 deletions

View file

@ -4,7 +4,7 @@
pkgname=device-oneplus-enchilada pkgname=device-oneplus-enchilada
pkgdesc="OnePlus 6" pkgdesc="OnePlus 6"
pkgver=13 pkgver=13
pkgrel=1 pkgrel=2
url="https://postmarketos.org" url="https://postmarketos.org"
license="MIT" license="MIT"
arch="aarch64" arch="aarch64"
@ -43,7 +43,6 @@ nonfree_firmware() {
pkgdesc="Modem, WiFi and GPU Firmware, also needed for osk-sdl" pkgdesc="Modem, WiFi and GPU Firmware, also needed for osk-sdl"
depends=" depends="
firmware-oneplus-sdm845>=9 firmware-oneplus-sdm845>=9
firmware-oneplus-sdm845-initramfs
hexagonrpcd hexagonrpcd
soc-qcom-sdm845-nonfree-firmware soc-qcom-sdm845-nonfree-firmware
soc-qcom-sdm845-modem soc-qcom-sdm845-modem

View file

@ -4,7 +4,7 @@
pkgname=device-oneplus-fajita pkgname=device-oneplus-fajita
pkgdesc="OnePlus 6T" pkgdesc="OnePlus 6T"
pkgver=13 pkgver=13
pkgrel=1 pkgrel=2
url="https://postmarketos.org" url="https://postmarketos.org"
license="MIT" license="MIT"
arch="aarch64" arch="aarch64"
@ -43,7 +43,6 @@ nonfree_firmware() {
pkgdesc="Modem, WiFi and GPU Firmware, also needed for osk-sdl" pkgdesc="Modem, WiFi and GPU Firmware, also needed for osk-sdl"
depends=" depends="
firmware-oneplus-sdm845>=9 firmware-oneplus-sdm845>=9
firmware-oneplus-sdm845-initramfs
hexagonrpcd hexagonrpcd
soc-qcom-sdm845-nonfree-firmware soc-qcom-sdm845-nonfree-firmware
soc-qcom-sdm845-modem soc-qcom-sdm845-modem

View file

@ -1,3 +0,0 @@
/lib/firmware/qcom/a630_gmu.bin
/lib/firmware/qcom/a630_sqe.fw
/lib/firmware/qcom/sdm845/oneplus6/a630_zap.mbn

View file

@ -2,7 +2,7 @@
pkgname=firmware-oneplus-sdm845 pkgname=firmware-oneplus-sdm845
pkgver=9 pkgver=9
pkgrel=0 pkgrel=1
pkgdesc="Firmware for OnePlus 6 / 6T" pkgdesc="Firmware for OnePlus 6 / 6T"
url="https://gitlab.com/sdm845-mainline/firmware-oneplus-sdm845" url="https://gitlab.com/sdm845-mainline/firmware-oneplus-sdm845"
arch="aarch64" arch="aarch64"
@ -16,12 +16,10 @@ _board2_commit="fc750b3f1bda29c08cfe9329eb781c0ae3608456"
source="$pkgname.tar.gz::$url/-/archive/$_version/$pkgname-$_version.tar.gz source="$pkgname.tar.gz::$url/-/archive/$_version/$pkgname-$_version.tar.gz
firmware.files firmware.files
sensor.files sensor.files
30-gpu-firmware.files
board-2.bin::https://gitlab.com/dylanvanassche/ath10k-firmware/-/raw/$_board2_commit/linux-firmware/board-2.bin board-2.bin::https://gitlab.com/dylanvanassche/ath10k-firmware/-/raw/$_board2_commit/linux-firmware/board-2.bin
30-oneplus-sdm845-firmware-ci.files 30-oneplus-sdm845-firmware-ci.files
" "
subpackages=" subpackages="
$pkgname-initramfs:firmware_initramfs
$pkgname-pmtest $pkgname-pmtest
$pkgname-sensors:firmware_sensors $pkgname-sensors:firmware_sensors
" "
@ -37,16 +35,6 @@ package() {
"$pkgdir"/lib/firmware/postmarketos/ath10k/WCN3990/hw1.0/board-2.bin "$pkgdir"/lib/firmware/postmarketos/ath10k/WCN3990/hw1.0/board-2.bin
} }
firmware_initramfs() {
pkgdesc="Files to be included in the initramfs to support osk-sdl"
depends="$pkgname"
install_if="$pkgname-nonfree-firmware"
mkdir "$subpkgdir"
install -Dm644 "$srcdir/30-gpu-firmware.files" \
"$subpkgdir/usr/share/mkinitfs/files/30-gpu-firmware.files"
}
pmtest() { pmtest() {
install_if="$pkgname=$pkgver-r$pkgrel postmarketos-mkinitfs-hook-ci" install_if="$pkgname=$pkgver-r$pkgrel postmarketos-mkinitfs-hook-ci"
@ -69,10 +57,9 @@ firmware_sensors() {
} }
sha512sums=" sha512sums="
d14b22434016cb12b8c04a3e7ac186451d77b92284e926a2771d958960d4da8ffb10cb9db555a200babcedd7be3379d2840882d19c26edc88805eee943310c2f firmware-oneplus-sdm845.tar.gz 59091452f1d6363fab0474ebc2738ec8fca6903c64837c3b6228eefb2030b0b4d5f0694770ddadf81f59f2ace4fad548459ad7a6604498aaa08a9064fb1dc736 firmware-oneplus-sdm845.tar.gz
23e4ea891f688bf5669e4b8479aab06b56c5478429b759c22fa417e1ad09cb413e55856140b456c6b676b8920ecec40aa0215d8fd61a23ac2c5c02240552f247 firmware.files 23e4ea891f688bf5669e4b8479aab06b56c5478429b759c22fa417e1ad09cb413e55856140b456c6b676b8920ecec40aa0215d8fd61a23ac2c5c02240552f247 firmware.files
4e5c4f55d4b084c6c21810b93a63a75ad86dd04cd1c079497bd2387f8bd0a411053ca1e894974af8bfda77ddc79c92a6669550be3a48fbef01cf797b54d6cb67 sensor.files 4e5c4f55d4b084c6c21810b93a63a75ad86dd04cd1c079497bd2387f8bd0a411053ca1e894974af8bfda77ddc79c92a6669550be3a48fbef01cf797b54d6cb67 sensor.files
bc6c329bf6bb9622320ab610f4f5fb944129e276855a4cf5646cb29a553f4c47cd9a4ef4305cbcd94a991471bc109b8f615cefd6871be99bf6a457fe0fa5aa19 30-gpu-firmware.files
a8eaab63f467553a65789a316d6f58cc15b0ad9bf3f698e6dbe51efa841db7f62a69d0c24b69da4f36de4a01dc29b723911d9cf17f925d3ce1170cbfa6b16029 board-2.bin a8eaab63f467553a65789a316d6f58cc15b0ad9bf3f698e6dbe51efa841db7f62a69d0c24b69da4f36de4a01dc29b723911d9cf17f925d3ce1170cbfa6b16029 board-2.bin
d6a81ab4697e763eebf2b428e8a63dbdd0a44743691d9277e9d3c7de26dbcbddaea1928a6cfa5509f8f41506d8812022f200ec47f87d28e05af77302683ffcf4 30-oneplus-sdm845-firmware-ci.files d6a81ab4697e763eebf2b428e8a63dbdd0a44743691d9277e9d3c7de26dbcbddaea1928a6cfa5509f8f41506d8812022f200ec47f87d28e05af77302683ffcf4 30-oneplus-sdm845-firmware-ci.files
" "