firmware-xiaomi-beryllium: use upstream board-2.bin

Provide common board-2.bin file, extended from linux-firmware. This file will be temporarily provided and dropped once all devices are added to upstream linux-firmware's board-2.bin file.
firmware-shift-sdm845: use upstream board-2.bin
2023-08-17 11:33:26 +02:00 · 2023-08-17 11:28:36 +02:00 · 2023-08-17 11:23:53 +02:00
5 changed files with 34 additions and 14 deletions
@@ -1,8 +1,8 @@
 # Maintainer: Caleb Connolly <caleb@connolly.tech>

 pkgname=firmware-oneplus-sdm845
-pkgver=7
-pkgrel=1
+pkgver=8
+pkgrel=0
 pkgdesc="Firmware for OnePlus 6 / 6T"
 url="https://gitlab.com/sdm845-mainline/firmware-oneplus-sdm845"
 arch="aarch64"
@@ -11,10 +11,13 @@ license="proprietary"
 options="!check !strip !archcheck !tracedeps pmb:cross-native"

 _version="895bb1c8dd0695635df354bbd713740af48e47ce"
+_board2_commit="fc750b3f1bda29c08cfe9329eb781c0ae3608456"

 source="$pkgname.tar.gz::$url/-/archive/$_version/$pkgname-$_version.tar.gz
 	firmware.files
-	30-gpu-firmware.files"
+	30-gpu-firmware.files
+	board-2.bin::https://gitlab.com/dylanvanassche/ath10k-firmware/-/raw/$_board2_commit/linux-firmware/board-2.bin
+	"
 subpackages="
 	$pkgname-initramfs:firmware_initramfs"

@@ -23,6 +26,10 @@ package() {
 	while IFS="" read -r _i || [ -n "$_i" ]; do
 		install -Dm644 "$_i" "$pkgdir/$_i"
 	done < "$srcdir/firmware.files"
+
+	# Install board-2.bin until upstream
+	install -Dm644 "$srcdir"/board-2.bin \
+		"$pkgdir"/lib/firmware/postmarketos/ath10k/WCN3990/hw1.0/board-2.bin
 }

 firmware_initramfs() {
@@ -37,6 +44,7 @@ firmware_initramfs() {

 sha512sums="
 59091452f1d6363fab0474ebc2738ec8fca6903c64837c3b6228eefb2030b0b4d5f0694770ddadf81f59f2ace4fad548459ad7a6604498aaa08a9064fb1dc736  firmware-oneplus-sdm845.tar.gz
-d2295ba3346ded12e88bb1b27958418cb14ab6bb8f2c23e73a66168f53eac0cc8a10e4be28181724e92ff75ef8608c4483641e24bfd9f05c4ff7b351179ba784  firmware.files
+f7a850f76eb5c757d4c7329b8e2040aadc62d9d5d7a6c21752f0fe1afb2343f9630738ede4b3c45cf1eba305e35923dd7f011e9fb6a68e97f3d25564b5c29306  firmware.files
 bc6c329bf6bb9622320ab610f4f5fb944129e276855a4cf5646cb29a553f4c47cd9a4ef4305cbcd94a991471bc109b8f615cefd6871be99bf6a457fe0fa5aa19  30-gpu-firmware.files
+a8eaab63f467553a65789a316d6f58cc15b0ad9bf3f698e6dbe51efa841db7f62a69d0c24b69da4f36de4a01dc29b723911d9cf17f925d3ce1170cbfa6b16029  board-2.bin
 "
@@ -1,4 +1,3 @@
-./lib/firmware/postmarketos/ath10k/WCN3990/hw1.0/board-2.bin
 ./lib/firmware/postmarketos/tfa98xx.cnt
 ./lib/firmware/postmarketos/qca/crbtfw21.tlv
 ./lib/firmware/qcom/sdm845/oneplus6/adspr.jsn
@@ -16,4 +15,4 @@
 ./lib/firmware/qcom/sdm845/oneplus6/ipa_fws.mbn
 ./lib/firmware/qcom/sdm845/oneplus6/mba.mbn
 ./lib/firmware/qcom/sdm845/oneplus6/modem.mbn
-./lib/firmware/qca/oneplus6/crnv21.bin
+./lib/firmware/qca/oneplus6/crnv21.bin
@@ -1,8 +1,8 @@
 # Maintainer: Alexander Martinz <amartinz@shiftphones.com>

 pkgname=firmware-shift-sdm845
-pkgver=0.3
-pkgrel=1
+pkgver=0.4
+pkgrel=0
 pkgdesc="Firmware for SHIFT sdm845 devices"
 url="https://gitlab.com/sdm845-mainline/firmware-shift-sdm845"
 arch="aarch64"
@@ -14,10 +14,12 @@ license="proprietary"
 options="!check !strip !archcheck !tracedeps pmb:cross-native"

 _version="ce9d27bf03624cceeaa8e7466f2e6dc731f2ba5e"
+_board2_commit="fc750b3f1bda29c08cfe9329eb781c0ae3608456"

 source="$pkgname.tar.gz::$url/-/archive/$_version/$pkgname-$_version.tar.gz
 	firmware.files
-	30-gpu-firmware.files"
+	30-gpu-firmware.files
+	board-2.bin::https://gitlab.com/dylanvanassche/ath10k-firmware/-/raw/$_board2_commit/linux-firmware/board-2.bin"
 subpackages="
 	$pkgname-initramfs:firmware_initramfs"

@@ -28,6 +30,10 @@ package() {
 		echo $_i
 		install -Dm644 $_i "$pkgdir/$_i"
 	done < "$srcdir/firmware.files"
+
+	# Install board-2.bin until upstream
+	install -Dm644 "$srcdir"/board-2.bin \
+		"$pkgdir"/lib/firmware/postmarketos/ath10k/WCN3990/hw1.0/board-2.bin
 }

 firmware_initramfs() {
@@ -42,6 +48,7 @@ firmware_initramfs() {

 sha512sums="
 86c3813a9f43e8f5f5e0df1215e37090011d6c468aad1a23f944a202e9fa740240869ed7b0b11ad032d35afaee72e903e24ca8d0e1de2f992902692f8c5983f8  firmware-shift-sdm845.tar.gz
-0b547cd027a9760cf16d80e63ebfb89282cff260bd07cc0bfea364513be7a5a32202a5f0aedbeb52dc5ca8087595a2842442a59f77dc7c9bcf5f154e905ceb15  firmware.files
+2f1087a2133d5dbdaad94927be9e88acdceb6873eab731b76b295b5248e5a91c3e9e6498b4400fc7219ba378ca4362448b882ccd87d2e73ae5fbf0fd613277ba  firmware.files
 8695a37da5578fdae506f373131ce9481be3db1a86f329c19893e7360b9cb0fadd47b0b1318b2e74702c5e76a9be022f58610940ad17becab49788689f6ca3f8  30-gpu-firmware.files
+a8eaab63f467553a65789a316d6f58cc15b0ad9bf3f698e6dbe51efa841db7f62a69d0c24b69da4f36de4a01dc29b723911d9cf17f925d3ce1170cbfa6b16029  board-2.bin
 "
@@ -1,4 +1,3 @@
-./lib/firmware/postmarketos/ath10k/WCN3990/hw1.0/board-2.bin
 ./lib/firmware/postmarketos/qca/crbtfw21.tlv
 ./lib/firmware/qca/axolotl/crnv21.bin
 ./lib/firmware/qcom/sdm845/axolotl/a630_zap.mbn
@@ -1,8 +1,8 @@
 # Maintainer: Joel Selvaraj <joelselvaraj.oss@gmail.com>

 pkgname=firmware-xiaomi-beryllium
-pkgver=6
-pkgrel=1
+pkgver=7
+pkgrel=0
 pkgdesc="Firmware for Xiaomi Poco F1"
 url="https://gitlab.com/sdm845-mainline/firmware-xiaomi-beryllium"
 arch="aarch64"
@@ -11,9 +11,11 @@ license="proprietary"
 options="!strip !check !archcheck !tracedeps pmb:cross-native"

 _commit="b4937f06a796cd30b8ddecd6cf7ed416eecc06a0"
+_board2_commit="fc750b3f1bda29c08cfe9329eb781c0ae3608456"

 source="$pkgname.tar.gz::$url/-/archive/$_commit/$pkgname-$_commit.tar.gz
-firmware.files"
+	firmware.files
+	board-2.bin::https://gitlab.com/dylanvanassche/ath10k-firmware/-/raw/$_board2_commit/linux-firmware/board-2.bin"

 package() {
 	cd "$srcdir/$pkgname-$_commit/"
@@ -22,9 +24,14 @@ package() {
 		echo $_i
 		install -Dm644 $_i "$pkgdir/$_i"
 	done < "$srcdir/firmware.files"
+
+	# Install board-2.bin until upstream
+	install -Dm644 "$srcdir"/board-2.bin \
+		"$pkgdir"/lib/firmware/postmarketos/ath10k/WCN3990/hw1.0/board-2.bin
 }

 sha512sums="
 41fdd771fe73e31bdce6088fdeb7686205f61b9888612fa83ac914e4bb524d22bba63894376a671d3acb19e90316a3d2eafdfb5425360ba53e41a38b9fd753ae  firmware-xiaomi-beryllium.tar.gz
 db32c8df77632e763c1ca3e80cee1ee2528c4986c944511c726add6e13fca6552ae63f6d436800439b7e615fd0c09f234888a68e4a6ff6663afe3dc593d6a7b0  firmware.files
+a8eaab63f467553a65789a316d6f58cc15b0ad9bf3f698e6dbe51efa841db7f62a69d0c24b69da4f36de4a01dc29b723911d9cf17f925d3ce1170cbfa6b16029  board-2.bin
 "