From e7b346bc056dcbe61e858ae3aaca34f94d8f8e26 Mon Sep 17 00:00:00 2001
From: lambdadroid <lambdadroid@gmail.com>
Date: Sun, 8 Dec 2019 22:45:44 +0100
Subject: [PATCH] firmware: Package modem firmware on MSM8916 mainline devices
 (!800)

MSM8916 has a single "modem" firmware for the audio DSP and modem.
In some early tests, the remote processor boots successfully at least
and the modem shows up in ofono. (Have not done further tests yet...)
However, audio stops working as soon as it is loaded
(because the audio DSP assumes control over the audio hardware).

For now let's just package it for all MSM8916 mainline devices
so it can be installed more easily. It is not used or installed
by default but it can be manually installed for testing.
---
 firmware/firmware-samsung-a3ulte/APKBUILD     | 10 ++++++++--
 firmware/firmware-samsung-a5ulte/APKBUILD     | 10 ++++++++--
 firmware/firmware-samsung-gt510wifi/APKBUILD  | 10 ++++++++--
 firmware/firmware-wileyfox-crackling/APKBUILD | 10 ++++++++--
 4 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/firmware/firmware-samsung-a3ulte/APKBUILD b/firmware/firmware-samsung-a3ulte/APKBUILD
index adaebca5d..e9707ebc8 100644
--- a/firmware/firmware-samsung-a3ulte/APKBUILD
+++ b/firmware/firmware-samsung-a3ulte/APKBUILD
@@ -1,9 +1,9 @@
 pkgname=firmware-samsung-a3ulte
-pkgver=1
+pkgver=2
 pkgrel=0
 pkgdesc="Firmware for Samsung Galaxy A3 (SM-A300FU)"
 url="https://rizzotherat.gitlab.io/firmware/"
-subpackages="$pkgname-venus $pkgname-wcnss"
+subpackages="$pkgname-modem $pkgname-venus $pkgname-wcnss"
 arch="aarch64"
 license="proprietary"
 options="!check !strip !archcheck"
@@ -16,6 +16,12 @@ package() {
 	mkdir -p "$pkgdir"
 }
 
+modem() {
+	pkgdesc="Samsung Galaxy A3 (SM-A300FU) modem firmware"
+	install -Dm644 "$srcdir"/mba.mbn -t "$subpkgdir/$_fwdir"
+	install -Dm644 "$srcdir"/modem.* -t "$subpkgdir/$_fwdir"
+}
+
 venus() {
 	pkgdesc="Samsung Galaxy A3 (SM-A300FU) video firmware"
 	install -Dm644 "$srcdir"/venus.* -t "$subpkgdir/$_fwdir"/qcom/venus-1.8
diff --git a/firmware/firmware-samsung-a5ulte/APKBUILD b/firmware/firmware-samsung-a5ulte/APKBUILD
index 5c917c2d7..f9b672cf9 100644
--- a/firmware/firmware-samsung-a5ulte/APKBUILD
+++ b/firmware/firmware-samsung-a5ulte/APKBUILD
@@ -1,9 +1,9 @@
 pkgname=firmware-samsung-a5ulte
-pkgver=1
+pkgver=2
 pkgrel=0
 pkgdesc="Firmware for Samsung Galaxy A5 (SM-A500FU)"
 url="https://rizzotherat.gitlab.io/firmware/"
-subpackages="$pkgname-venus $pkgname-wcnss"
+subpackages="$pkgname-modem $pkgname-venus $pkgname-wcnss"
 arch="aarch64"
 license="proprietary"
 options="!check !strip !archcheck"
@@ -16,6 +16,12 @@ package() {
 	mkdir -p "$pkgdir"
 }
 
+modem() {
+	pkgdesc="Samsung Galaxy A5 (SM-A500FU) modem firmware"
+	install -Dm644 "$srcdir"/mba.mbn -t "$subpkgdir/$_fwdir"
+	install -Dm644 "$srcdir"/modem.* -t "$subpkgdir/$_fwdir"
+}
+
 venus() {
 	pkgdesc="Samsung Galaxy A5 (SM-A500FU) video firmware"
 	install -Dm644 "$srcdir"/venus.* -t "$subpkgdir/$_fwdir"/qcom/venus-1.8
diff --git a/firmware/firmware-samsung-gt510wifi/APKBUILD b/firmware/firmware-samsung-gt510wifi/APKBUILD
index 80378a8b1..695c418f0 100644
--- a/firmware/firmware-samsung-gt510wifi/APKBUILD
+++ b/firmware/firmware-samsung-gt510wifi/APKBUILD
@@ -1,9 +1,9 @@
 pkgname=firmware-samsung-gt510wifi
-pkgver=1
+pkgver=2
 pkgrel=0
 pkgdesc="Firmware for Samsung Galaxy Tab A 9.7 WiFi (2015) (SM-T550)"
 url="https://rizzotherat.gitlab.io/firmware/"
-subpackages="$pkgname-venus $pkgname-wcnss"
+subpackages="$pkgname-modem $pkgname-venus $pkgname-wcnss"
 arch="aarch64"
 license="proprietary"
 options="!check !strip !archcheck"
@@ -16,6 +16,12 @@ package() {
 	mkdir -p "$pkgdir"
 }
 
+modem() {
+	pkgdesc="Samsung Galaxy Tab A 9.7 WiFi (2015) (SM-T550) modem firmware"
+	install -Dm644 "$srcdir"/mba.mbn -t "$subpkgdir/$_fwdir"
+	install -Dm644 "$srcdir"/modem.* -t "$subpkgdir/$_fwdir"
+}
+
 venus() {
 	pkgdesc="Samsung Galaxy Tab A 9.7 WiFi (2015) (SM-T550) video firmware"
 	install -Dm644 "$srcdir"/venus.* -t "$subpkgdir/$_fwdir"/qcom/venus-1.8
diff --git a/firmware/firmware-wileyfox-crackling/APKBUILD b/firmware/firmware-wileyfox-crackling/APKBUILD
index 4ba32fc37..f440f1830 100644
--- a/firmware/firmware-wileyfox-crackling/APKBUILD
+++ b/firmware/firmware-wileyfox-crackling/APKBUILD
@@ -1,9 +1,9 @@
 pkgname=firmware-wileyfox-crackling
-pkgver=1
+pkgver=2
 pkgrel=0
 pkgdesc="Firmware for Wileyfox Swift"
 url="https://rizzotherat.gitlab.io/firmware/"
-subpackages="$pkgname-venus $pkgname-wcnss"
+subpackages="$pkgname-modem $pkgname-venus $pkgname-wcnss"
 arch="aarch64"
 license="proprietary"
 options="!check !strip !archcheck"
@@ -16,6 +16,12 @@ package() {
 	mkdir -p "$pkgdir"
 }
 
+modem() {
+	pkgdesc="Wileyfox Swift modem firmware"
+	install -Dm644 "$srcdir"/mba.mbn -t "$subpkgdir/$_fwdir"
+	install -Dm644 "$srcdir"/modem.* -t "$subpkgdir/$_fwdir"
+}
+
 venus() {
 	pkgdesc="Wileyfox Swift video firmware"
 	install -Dm644 "$srcdir"/venus.* -t "$subpkgdir/$_fwdir"/qcom/venus-1.8