From 378d76b830c331f3a66c2b58c46c75cf31becbe2 Mon Sep 17 00:00:00 2001 From: Caleb Connolly Date: Tue, 5 Dec 2023 16:36:53 +0000 Subject: [PATCH] firmware-shift-sdm845: drop firmware-initramfs (MR 4599) Now we're using unl0kr, we don't have to include the GPU firmware in the initramfs anymore! Signed-off-by: Caleb Connolly --- device/community/device-shift-axolotl/APKBUILD | 3 +-- .../firmware-shift-sdm845/30-gpu-firmware.files | 3 --- device/community/firmware-shift-sdm845/APKBUILD | 15 +-------------- 3 files changed, 2 insertions(+), 19 deletions(-) delete mode 100644 device/community/firmware-shift-sdm845/30-gpu-firmware.files diff --git a/device/community/device-shift-axolotl/APKBUILD b/device/community/device-shift-axolotl/APKBUILD index adf5e0bd1..e6f8706a3 100644 --- a/device/community/device-shift-axolotl/APKBUILD +++ b/device/community/device-shift-axolotl/APKBUILD @@ -5,7 +5,7 @@ pkgname=device-shift-axolotl pkgdesc="SHIFT6mq" pkgver=14 -pkgrel=1 +pkgrel=2 url="https://postmarketos.org" license="MIT" arch="aarch64" @@ -45,7 +45,6 @@ nonfree_firmware() { pkgdesc="Modem, GPU and WiFi Firmware, also needed for osk-sdl" depends=" firmware-shift-sdm845>=20230815-r2 - firmware-shift-sdm845-initramfs hexagonrpcd soc-qcom-sdm845-nonfree-firmware soc-qcom-sdm845-modem diff --git a/device/community/firmware-shift-sdm845/30-gpu-firmware.files b/device/community/firmware-shift-sdm845/30-gpu-firmware.files deleted file mode 100644 index fcba97653..000000000 --- a/device/community/firmware-shift-sdm845/30-gpu-firmware.files +++ /dev/null @@ -1,3 +0,0 @@ -/lib/firmware/qcom/a630_gmu.bin -/lib/firmware/qcom/a630_sqe.fw -/lib/firmware/qcom/sdm845/axolotl/a630_zap.mbn diff --git a/device/community/firmware-shift-sdm845/APKBUILD b/device/community/firmware-shift-sdm845/APKBUILD index 192e247dc..95d86f958 100644 --- a/device/community/firmware-shift-sdm845/APKBUILD +++ b/device/community/firmware-shift-sdm845/APKBUILD @@ -2,7 +2,7 @@ pkgname=firmware-shift-sdm845 pkgver=20230815 -pkgrel=2 +pkgrel=3 pkgdesc="Firmware for SHIFT sdm845 devices" url="https://gitlab.com/sdm845-mainline/firmware-shift-sdm845" arch="aarch64" @@ -20,11 +20,9 @@ _board2_commit="fc750b3f1bda29c08cfe9329eb781c0ae3608456" source="$pkgname.tar.gz::$url/-/archive/$_version/$pkgname-$_version.tar.gz firmware.files sensors.files - 30-gpu-firmware.files 30-shift-sdm845-firmware-ci.files board-2.bin::https://gitlab.com/dylanvanassche/ath10k-firmware/-/raw/$_board2_commit/linux-firmware/board-2.bin" subpackages=" - $pkgname-initramfs:firmware_initramfs $pkgname-pmtest $pkgname-sensors:firmware_sensors " @@ -42,16 +40,6 @@ package() { "$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() { install_if="$pkgname=$pkgver-r$pkgrel postmarketos-mkinitfs-hook-ci" @@ -77,7 +65,6 @@ sha512sums=" 72cbbbc2d1ea2698ee25e554cdb099729c059a01ab21efe66d2dd60c7aff7b138ec1b4dc1b5b86e5d69a87ef2950b614f36089e919c9436881cc2a3fbe384d55 firmware-shift-sdm845.tar.gz 2f1087a2133d5dbdaad94927be9e88acdceb6873eab731b76b295b5248e5a91c3e9e6498b4400fc7219ba378ca4362448b882ccd87d2e73ae5fbf0fd613277ba firmware.files be1aa0e7d1a5689d2f6b85d6244d0a2ec0729b92d3a165fc5162f039849ee2da49b311a4713cd11924ee70933dacb88c879b805504bb89709f10807d89207a15 sensors.files -8695a37da5578fdae506f373131ce9481be3db1a86f329c19893e7360b9cb0fadd47b0b1318b2e74702c5e76a9be022f58610940ad17becab49788689f6ca3f8 30-gpu-firmware.files 97756b554cc0f91a69f511496663a012287517ec5853167246fe59c4deeb1cbf1eb352ec267bd0ad897e3f30547d2ad2818e70b597d9dfec26db45efca85b3f2 30-shift-sdm845-firmware-ci.files a8eaab63f467553a65789a316d6f58cc15b0ad9bf3f698e6dbe51efa841db7f62a69d0c24b69da4f36de4a01dc29b723911d9cf17f925d3ce1170cbfa6b16029 board-2.bin "