From fe05f5b898790906024082694ee006dc4e5bf46c Mon Sep 17 00:00:00 2001
From: Luca Weiss <luca@z3ntu.xyz>
Date: Mon, 27 Sep 2021 11:10:49 +0200
Subject: [PATCH] firmware-fairphone-fp3: also package adsp & modem firmware
 (MR 2557)

---
 .../testing/firmware-fairphone-fp3/APKBUILD   | 26 ++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/device/testing/firmware-fairphone-fp3/APKBUILD b/device/testing/firmware-fairphone-fp3/APKBUILD
index c7860fcc0..c9a8e7f77 100644
--- a/device/testing/firmware-fairphone-fp3/APKBUILD
+++ b/device/testing/firmware-fairphone-fp3/APKBUILD
@@ -1,11 +1,15 @@
 pkgname=firmware-fairphone-fp3
-pkgver=20210420.0
+pkgver=20210420.1
 pkgrel=0
 pkgdesc="Firmware for Fairphone 3"
 url="https://gitlab.com/knfr/firmware-fairphone-fp3"
 arch="aarch64"
 license="proprietary"
-subpackages="$pkgname-wcnss"
+subpackages="
+	$pkgname-adsp
+	$pkgname-modem
+	$pkgname-wcnss
+"
 options="!check !strip !archcheck !tracedeps pmb:cross-native"
 
 source="$pkgname-$pkgver.tar.gz::$url/-/archive/$pkgver/$pkgname-$pkgver.tar.gz"
@@ -15,6 +19,22 @@ package() {
 	mkdir -p "$pkgdir"
 }
 
+adsp() {
+	pkgdesc="Fairphone 3 firmware for the ADSP"
+
+	install -Dm644 "$builddir"/adsp.* -t \
+		"$subpkgdir/$_fwdir"
+}
+
+modem() {
+	pkgdesc="Fairphone 3 firmware for the modem"
+
+	install -Dm644 "$builddir"/mba.mbn -t \
+		"$subpkgdir/$_fwdir"
+	install -Dm644 "$builddir"/modem.* -t \
+		"$subpkgdir/$_fwdir"
+}
+
 wcnss() {
 	pkgdesc="Fairphone 3 firmware for the Qualcomm Wireless Connectivity Subsystem (WCNSS)"
 	depends="wcnss-wlan"
@@ -26,5 +46,5 @@ wcnss() {
 }
 
 sha512sums="
-bf2aea11343a4c0cd0f7a6d7ac7304674f2eb565ebe78dc1020e7756d9ee13c8fc45ff03e5c4d8f532528c2d613834603dbf01f68944ec8faeb08b3bc7d86470  firmware-fairphone-fp3-20210420.0.tar.gz
+6e077c7098fc27115cb9405ee2c9b140cd7810921afe7fa001bdd0606693c03cfacb5f50dc1fe91a16dde23686b97929c8d1f5e836a0be5b4b762a7de064a88c  firmware-fairphone-fp3-20210420.1.tar.gz
 "