From 74239f039e2a4a02529cf24537132373cd9cf949 Mon Sep 17 00:00:00 2001
From: Minecrell <minecrell@minecrell.net>
Date: Wed, 22 Sep 2021 15:57:03 +0200
Subject: [PATCH] motorola-harpia: use msm-firmware-loader (MR 2431)

---
 .../community/device-motorola-harpia/APKBUILD | 14 +++-----------
 .../firmware-motorola-harpia/APKBUILD         | 19 ++++++-------------
 2 files changed, 9 insertions(+), 24 deletions(-)

diff --git a/device/community/device-motorola-harpia/APKBUILD b/device/community/device-motorola-harpia/APKBUILD
index d5edc215a..3c6484323 100644
--- a/device/community/device-motorola-harpia/APKBUILD
+++ b/device/community/device-motorola-harpia/APKBUILD
@@ -3,8 +3,8 @@
 # Co-Maintainer: Minecrell <minecrell@minecrell.net>
 pkgname=device-motorola-harpia
 pkgdesc="Motorola Moto G4 Play"
-pkgver=4
-pkgrel=1
+pkgver=5
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -17,7 +17,6 @@ subpackages="
 	$pkgname-kernel-mainline:kernel_mainline
 	$pkgname-kernel-mainline-modem:kernel_mainline_modem
 	$pkgname-nonfree-firmware:nonfree_firmware
-	$pkgname-nonfree-firmware-modem:nonfree_firmware_modem
 "
 
 build() {
@@ -42,14 +41,7 @@ kernel_mainline_modem() {
 
 nonfree_firmware() {
 	pkgdesc="GPU/Wi-Fi/Bluetooth/Video(/Modem) firmware"
-	depends="linux-firmware-qcom firmware-motorola-harpia-wcnss firmware-motorola-harpia-venus"
-	mkdir "$subpkgdir"
-}
-
-nonfree_firmware_modem() {
-	pkgdesc="Modem firmware"
-	depends="firmware-motorola-harpia-modem"
-	install_if="$pkgname-nonfree-firmware $pkgname-kernel-mainline-modem"
+	depends="linux-firmware-qcom msm-firmware-loader firmware-motorola-harpia-wcnss-nv firmware-motorola-harpia-venus"
 	mkdir "$subpkgdir"
 }
 
diff --git a/device/community/firmware-motorola-harpia/APKBUILD b/device/community/firmware-motorola-harpia/APKBUILD
index 436f0049b..a7a108c29 100644
--- a/device/community/firmware-motorola-harpia/APKBUILD
+++ b/device/community/firmware-motorola-harpia/APKBUILD
@@ -1,10 +1,10 @@
 # Maintainer: Ruby Iris Juric <ruby@srxl.me>
 pkgname=firmware-motorola-harpia
-pkgver=1
-pkgrel=2
+pkgver=2
+pkgrel=0
 pkgdesc="Firmware for Motorola Moto G4 Play"
 url="https://github.com/Sorixelle/vendor_motorola_harpia"
-subpackages="$pkgname-wcnss $pkgname-venus $pkgname-modem"
+subpackages="$pkgname-wcnss-nv:wcnss_nv $pkgname-venus"
 arch="aarch64"
 license="proprietary"
 options="!check !strip !archcheck !tracedeps pmb:cross-native"
@@ -18,10 +18,10 @@ package() {
 	mkdir -p "$pkgdir"
 }
 
-wcnss() {
-	pkgdesc="Motorola Moto G4 Play Wi-Fi/Bluetooth firmware"
+wcnss_nv() {
+	pkgdesc="Motorola Moto G4 Play Wi-Fi/Bluetooth firmware configuration"
+	replaces="firmware-motorola-harpia-wcnss"
 	cd "$srcdir/vendor_motorola_harpia-$_commit"
-	install -Dm644 wcnss.* -t "$subpkgdir/$_fwdir"
 	install -Dm644 wlan/prima/WCNSS_qcom_wlan_nv.bin -t "$subpkgdir/$_fwdir/wlan/prima"
 }
 
@@ -32,11 +32,4 @@ venus() {
 	install -Dm644 venus.mdt -t "$subpkgdir/$_fwdir/qcom/venus-1.8"
 }
 
-modem() {
-	pkgdesc="Motorola Moto G4 Play modem firmware"
-	cd "$srcdir/vendor_motorola_harpia-$_commit"
-	install -Dm644 modem.* -t "$subpkgdir/$_fwdir"
-	install -Dm644 mba.mbn -t "$subpkgdir/$_fwdir"
-}
-
 sha512sums="56a7f815bea3d20a5ef0241ae109ac3823c6ac433e2a05389035b7005c7966d7a0a7719dbf5a562c6cf53c18cebd6893d31d27a6efc1a50c307565f873b1aa54  firmware-motorola-harpia-a81be710b0ff4ee7e5fd1962184dcd882cc13efc.tar.gz"