From 881bbdd158140a1fb15742b4485612de4bd8d75e Mon Sep 17 00:00:00 2001
From: Martin Lillepuu <martin@mlp.ee>
Date: Mon, 25 Jul 2022 15:44:06 +0300
Subject: [PATCH] testing/firmware-oneplus-oneplus3t: add custom ath10k board
 file (MR 3313)

[ci:skip-build]: already built successfully in CI
---
 .../firmware-oneplus-oneplus3t/APKBUILD       | 20 +++++++++++++------
 .../firmware-oneplus-oneplus3t/board-2.json   |  1 +
 2 files changed, 15 insertions(+), 6 deletions(-)
 create mode 100644 device/testing/firmware-oneplus-oneplus3t/board-2.json

diff --git a/device/testing/firmware-oneplus-oneplus3t/APKBUILD b/device/testing/firmware-oneplus-oneplus3t/APKBUILD
index a5a9be5d4..263ddcffb 100644
--- a/device/testing/firmware-oneplus-oneplus3t/APKBUILD
+++ b/device/testing/firmware-oneplus-oneplus3t/APKBUILD
@@ -1,12 +1,13 @@
 pkgname=firmware-oneplus-oneplus3t
-pkgver=1
+pkgver=2
 pkgrel=0
 pkgdesc="Firmware for OnePlus 3T"
-url="https://gitlab.com/DrGitX/firmware-oneplus3"
+url="https://gitlab.com/DrGit/firmware-oneplus3"
 arch="aarch64"
 license="proprietary"
-makedepends="mtools pil-squasher"
+makedepends="mtools pil-squasher qca-swiss-army-knife"
 options="!check !strip !archcheck !tracedeps pmb:cross-native"
+replaces="linux-firmware-ath10k"
 _gpufw="https://github.com/TheMuppets/proprietary_vendor_oneplus/raw/lineage-17.1/oneplus3/proprietary/vendor/firmware"
 _files="adsp.b00
 	adsp.b01
@@ -18,6 +19,7 @@ _files="adsp.b00
 	adsp.b08
 	adsp.b09
 	adsp.mdt
+	bdwlan30.bin
 	modem.b00
 	modem.b01
 	modem.b02
@@ -63,9 +65,10 @@ _files="adsp.b00
 	venus.b04
 	venus.mdt
 "
-source="$url/-/raw/master/oneplus3t/NON-HLOS.bin
+source="$pkgname-$pkgver-NON-HLOS.bin::$url/-/raw/master/oneplus3t/NON-HLOS.bin
 	$_gpufw/a530_zap-pro.elf
 	20-adreno-gpu-firmware.files
+	board-2.json
 "
 
 _mdtnames="adsp modem slpi venus"
@@ -74,7 +77,7 @@ _mbns="a530_zap.mbn adsp.mbn mba.mbn modem.mbn slpi.mbn venus.mbn"
 unpack() {
 	# Extract blobs
 	for _i in $_files; do
-		mcopy -v -b -p -n -i $srcdir/NON-HLOS.bin ::image/$_i $_i
+		mcopy -v -b -p -n -i $srcdir/$pkgname-$pkgver-NON-HLOS.bin ::image/$_i $_i
 	done
 }
 
@@ -95,10 +98,15 @@ package() {
 	# Install 20-adreno-gpu-firmware.files
 	install -Dm644 "$srcdir/20-adreno-gpu-firmware.files" \
 		"$pkgdir/etc/postmarketos-mkinitfs/files/20-adreno-gpu-firmware.files"
+
+	# Create and install ath10k board file
+	ath10k-bdencoder -c board-2.json
+	install -Dm644 board-2.bin -t "$pkgdir/lib/firmware/ath10k/QCA6174/hw3.0"
 }
 
 sha512sums="
-c0f3f908e237202003d9b2fe4071e2800bdcdae180e8311fbc0671478fcd63aba5a3fe5ab5d297010c12c232501f05f31141fc39a44c5b86ac2b56016f553a7f  NON-HLOS.bin
+3da90f51fc39c3db4f0f39c07eda318b0b1fc85f7fbb8f21bd31a3ae5c73a4b39ba630a9521a7c5ee844e14c24d084f5d42e4c2ffd2bdee541e50ec7b1629b14  firmware-oneplus-oneplus3t-2-NON-HLOS.bin
 237c82252f1ff44a454bed5f84a8dcf74e0f6ea6e5674e7d5aa32436fcf20d8c9df5c6edc4b4bc151e5fdce4694c1d14edc8ba0804ceb738f3fb67eff950aeff  a530_zap-pro.elf
 e3445fe6aa3e14cb45b593e5d7a1fb786f22f0b5bc82862b4776b17fe2a086950d6f59c310359d77605d1d0cba6beaaf0879939c5239d7dc6248a4b03dc75a4a  20-adreno-gpu-firmware.files
+8deca102436a21d97911f9a2a819ec52991a3089a7c08acc1c919791a6dc77e2ebb9902ada7be9370cb9160f0b8a83b3b402c034f6da97f0c3245a9577570d47  board-2.json
 "
diff --git a/device/testing/firmware-oneplus-oneplus3t/board-2.json b/device/testing/firmware-oneplus-oneplus3t/board-2.json
new file mode 100644
index 000000000..af66f138b
--- /dev/null
+++ b/device/testing/firmware-oneplus-oneplus3t/board-2.json
@@ -0,0 +1 @@
+[{"names":["bus=pci,vendor=168c,device=003e,subsystem-vendor=0000,subsystem-device=0000"],"data":"bdwlan30.bin"}]