From 2b11f2b778567b08c3e252bb99a13f4c8faf4e0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Barnab=C3=A1s=20Cz=C3=A9m=C3=A1n?= <trabarni@gmail.com>
Date: Sun, 1 Oct 2023 01:14:47 +0200
Subject: [PATCH] xiaomi-mido: switch to msm-firmware-loader and clean ups (MR
 4433)

Utilize msm-firmware-loader for minimize device specific
firmware package.
Add necessary modules to initramfs for fix fde.
Use soc-qcom-msm8953-modem and soc-qcom-msm8953-initramfs as a dependency.
---
 device/testing/device-xiaomi-mido/APKBUILD    | 28 +++++++++++++------
 .../testing/device-xiaomi-mido/modules-initfs |  6 ++--
 device/testing/firmware-xiaomi-mido/APKBUILD  | 25 ++++-------------
 3 files changed, 29 insertions(+), 30 deletions(-)

diff --git a/device/testing/device-xiaomi-mido/APKBUILD b/device/testing/device-xiaomi-mido/APKBUILD
index 3b048fd4e..3e91b0f2b 100644
--- a/device/testing/device-xiaomi-mido/APKBUILD
+++ b/device/testing/device-xiaomi-mido/APKBUILD
@@ -1,17 +1,23 @@
+# Maintainer: Barnabas Czeman <trabarni@gmail.com>
 pkgname=device-xiaomi-mido
 pkgdesc="Xiaomi Redmi Note 4X"
-pkgver=3
-pkgrel=4
+pkgver=4
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
-depends="postmarketos-base mkbootimg soc-qcom-msm8953 linux-postmarketos-qcom-msm8953 lk2nd-msm8953"
+depends="
+	linux-postmarketos-qcom-msm8953
+	lk2nd-msm8953
+	mkbootimg
+	postmarketos-base
+	soc-qcom-msm8953
+"
 makedepends="devicepkg-dev"
 source="deviceinfo modules-initfs"
-subpackages="
-	$pkgname-nonfree-firmware:nonfree_firmware
-"
+subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
+
 build() {
 	devicepkg_build $startdir $pkgname
 }
@@ -22,11 +28,17 @@ package() {
 
 nonfree_firmware() {
 	pkgdesc="Proprietary firmware"
-	depends="linux-firmware-qcom firmware-xiaomi-mido"
+	depends="
+		firmware-xiaomi-mido
+		linux-firmware-qcom
+		msm-firmware-loader
+		soc-qcom-msm8953-initramfs
+		soc-qcom-msm8953-modem
+	"
 	mkdir "$subpkgdir"
 }
 
 sha512sums="
 cdca8edd4ccb13c0198493dcf14e43a2acf8eaddc1dcfba6eb895485b172c7315ab389011fdf9bb54b68a4fb82c31d9a7b50caa566d1aa992a347facb49758b4  deviceinfo
-261ec93707743390e0db7bdc33099fa145b479a3c5c45b8aa25e555a649ddacb63b1ed2c2524b71b876dc2f2540eca47392d6670c314c858ba6b3266274d4a42  modules-initfs
+9654cd063b4698fca513f3bd527bfa5f26c3ac371b67c8efbffc9fdd5b69d2ea2c587646bded4a9dcf091208f034c44cd12bae351597d68026e24335d78b9a1f  modules-initfs
 "
diff --git a/device/testing/device-xiaomi-mido/modules-initfs b/device/testing/device-xiaomi-mido/modules-initfs
index e20ea3d40..7875ea99d 100644
--- a/device/testing/device-xiaomi-mido/modules-initfs
+++ b/device/testing/device-xiaomi-mido/modules-initfs
@@ -1,6 +1,8 @@
+bam_dma
+edt_ft5x06
 msm
-panel_xiaomi_nt35532
 panel_xiaomi_boe_ili9885
-panel_xiaomi_tianma_nt35596
 panel_xiaomi_ebbg_r63350
+panel_xiaomi_nt35532
 panel_xiaomi_otm1911
+panel_xiaomi_tianma_nt35596
diff --git a/device/testing/firmware-xiaomi-mido/APKBUILD b/device/testing/firmware-xiaomi-mido/APKBUILD
index 1f055d885..8c3b560c9 100644
--- a/device/testing/firmware-xiaomi-mido/APKBUILD
+++ b/device/testing/firmware-xiaomi-mido/APKBUILD
@@ -1,5 +1,6 @@
+# Maintainer: Barnabas Czeman <trabarni@gmail.com>
 pkgname=firmware-xiaomi-mido
-pkgver=2
+pkgver=3
 pkgrel=0
 pkgdesc="Firmware for Xiaomi Redmi Note 4X"
 url="https://github.com/Kiciuk/proprietary_firmware_mido"
@@ -8,30 +9,14 @@ license="proprietary"
 options="!check !strip !archcheck !tracedeps pmb:cross-native"
 _commit="bc001cbb255a0ded2b58af07b93f712cd9322483"
 source="https://github.com/Kiciuk/proprietary_firmware_mido/archive/$_commit.zip"
-builddir="$srcdir/proprietary_firmware_mido-$_commit"
+builddir="$srcdir/proprietary_firmware_mido-$_commit/apnhlos"
 
 _fwdir="/lib/firmware/postmarketos"
 
 package() {
-	# parent package is empty
-	mkdir -p "$pkgdir"
-
-	# modem firmware
-	install -Dm644 modem/mba.mbn -t "$pkgdir/$_fwdir"
-	install -Dm644 modem/modem.* -t "$pkgdir/$_fwdir"
-
-	# video firmware
-	install -Dm644 apnhlos/venus.* -t "$pkgdir/$_fwdir"
-
-	# WiFi/BT firmware
-	install -Dm644 apnhlos/wcnss.* -t "$pkgdir/$_fwdir"
-	install -Dm644 firmware/wlan/prima/WCNSS_qcom_wlan_nv.bin -t "$pkgdir/$_fwdir"/wlan/prima
-
-	# ADSP firmware
-	install -Dm644 modem/adsp.* -t "$pkgdir/$_fwdir"
-
 	# GPU firmware
-	install -Dm644 apnhlos/a506_zap.* -t "$pkgdir/$_fwdir"
+	install -Dm644 a506_zap.mdt -t "$pkgdir/$_fwdir"
+	install -Dm644 a506_zap.b02 -t "$pkgdir/$_fwdir"
 }
 
 sha512sums="09a671286f1bc2389763432b42be30d2a7b52717cc2f2cb1dc0e144d3ade84fadcfd3971b5dec7bbc04750fac93be0ef2bba81bbd6740ce3da396899c03f0a1c  bc001cbb255a0ded2b58af07b93f712cd9322483.zip"