From f81d94d258b69e9a18272571eaff366810b1e7df Mon Sep 17 00:00:00 2001
From: Minecrell <minecrell@minecrell.net>
Date: Wed, 22 Sep 2021 16:17:50 +0200
Subject: [PATCH] alcatel-idol347: use msm-firmware-loader (MR 2431)

---
 device/testing/device-alcatel-idol347/APKBUILD   | 14 +++-----------
 device/testing/firmware-alcatel-idol347/APKBUILD | 10 ++++++++--
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/device/testing/device-alcatel-idol347/APKBUILD b/device/testing/device-alcatel-idol347/APKBUILD
index 8aa90c973..2b6b088d9 100644
--- a/device/testing/device-alcatel-idol347/APKBUILD
+++ b/device/testing/device-alcatel-idol347/APKBUILD
@@ -2,8 +2,8 @@
 # Maintainer: Vincent Knecht <vincent.knecht@mailoo.org>
 pkgname=device-alcatel-idol347
 pkgdesc="Alcatel OneTouch Idol 3 (4.7)"
-pkgver=1
-pkgrel=2
+pkgver=2
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -15,7 +15,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
 	$pkgname-phosh
 "
 
@@ -42,14 +41,7 @@ kernel_mainline_modem() {
 
 nonfree_firmware() {
 	pkgdesc="GPU/WiFi/BT/Video firmware"
-	depends="linux-firmware-qcom firmware-alcatel-idol347-venus firmware-alcatel-idol347-wcnss"
-	mkdir "$subpkgdir"
-}
-
-nonfree_firmware_modem() {
-	pkgdesc="Modem firmware"
-	depends="firmware-alcatel-idol347-modem"
-	install_if="$pkgname-nonfree-firmware $pkgname-kernel-mainline-modem"
+	depends="linux-firmware-qcom msm-firmware-loader firmware-alcatel-idol347-wcnss-nv firmware-alcatel-idol347-venus"
 	mkdir "$subpkgdir"
 }
 
diff --git a/device/testing/firmware-alcatel-idol347/APKBUILD b/device/testing/firmware-alcatel-idol347/APKBUILD
index 3ba34de28..36f27cf56 100644
--- a/device/testing/firmware-alcatel-idol347/APKBUILD
+++ b/device/testing/firmware-alcatel-idol347/APKBUILD
@@ -1,9 +1,9 @@
 pkgname=firmware-alcatel-idol347
-pkgver=1
+pkgver=2
 pkgrel=0
 pkgdesc="Firmware for Alcatel OneTouch Idol 3 (4.7)"
 url="https://github.com/vknecht/"
-subpackages="$pkgname-modem $pkgname-venus $pkgname-wcnss"
+subpackages="$pkgname-modem $pkgname-venus $pkgname-wcnss $pkgname-wcnss-nv:wcnss_nv"
 arch="aarch64"
 license="proprietary"
 options="!check !strip !archcheck !tracedeps pmb:cross-native"
@@ -33,6 +33,12 @@ wcnss() {
 	pkgdesc="Alcatel OneTouch Idol 3 (4.7) WiFi/BT firmware"
 	cd "$srcdir"/"$_repository"-"$_commit"
 	install -Dm644 wcnss.* -t "$subpkgdir/$_fwdir"
+}
+
+wcnss_nv() {
+	pkgdesc="Alcatel OneTouch Idol 3 (4.7) WiFi/BT firmware configuration"
+	replaces="firmware-alcatel-idol347-wcnss"
+	cd "$srcdir"/"$_repository"-"$_commit"
 	install -Dm644 WCNSS_* -t "$subpkgdir/$_fwdir"/wlan/prima
 }